Skip to content
Permalink
Browse files
MDEV-10991: Server crashes in spider_udf_direct_sql_create_conn - tes…
…ts in spider/oracle* suites crash the server

The fix for this bug was automatically merged from 10.1.  However, part of that
fix is unnecessary in 10.3.  This commit rolls back the part of the fix that is
unnecessary in 10.3.

Author:
  Jacob Mathew.

Reviewer:
  Kentoku Shiba.
  • Loading branch information
Jacob Mathew committed Apr 3, 2018
1 parent 131ed6c commit 1eee986
Showing 1 changed file with 0 additions and 16 deletions.
@@ -399,14 +399,6 @@ SPIDER_CONN *spider_udf_direct_sql_create_conn(
if (direct_sql->access_mode == 0)
{
#endif
if (direct_sql->dbton_id == SPIDER_DBTON_SIZE)
{
/* Invalid target wrapper */
*error_num = ER_SPIDER_INVALID_CONNECT_INFO_NUM;
my_printf_error(*error_num, ER_SPIDER_INVALID_CONNECT_INFO_STR,
MYF(0), direct_sql->tgt_wrapper);
goto error_alloc_conn;
}
if (!(conn = (SPIDER_CONN *)
spider_bulk_malloc(spider_current_trx, 32, MYF(MY_WME | MY_ZEROFILL),
&conn, sizeof(*conn),
@@ -434,14 +426,6 @@ SPIDER_CONN *spider_udf_direct_sql_create_conn(
conn->default_database.init_calc_mem(138);
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
} else {
if (direct_sql->dbton_id == SPIDER_DBTON_SIZE)
{
/* Invalid target wrapper */
*error_num = ER_SPIDER_NOSQL_WRAPPER_IS_INVALID_NUM;
my_printf_error(*error_num, ER_SPIDER_NOSQL_WRAPPER_IS_INVALID_STR,
MYF(0), direct_sql->tgt_wrapper);
goto error_alloc_conn;
}
if (!(conn = (SPIDER_CONN *)
spider_bulk_malloc(spider_current_trx, 33, MYF(MY_WME | MY_ZEROFILL),
&conn, sizeof(*conn),

0 comments on commit 1eee986

Please sign in to comment.