Skip to content

Commit 1eee986

Browse files
author
Jacob Mathew
committed
MDEV-10991: Server crashes in spider_udf_direct_sql_create_conn - tests 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.
1 parent 131ed6c commit 1eee986

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

storage/spider/spd_direct_sql.cc

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -399,14 +399,6 @@ SPIDER_CONN *spider_udf_direct_sql_create_conn(
399399
if (direct_sql->access_mode == 0)
400400
{
401401
#endif
402-
if (direct_sql->dbton_id == SPIDER_DBTON_SIZE)
403-
{
404-
/* Invalid target wrapper */
405-
*error_num = ER_SPIDER_INVALID_CONNECT_INFO_NUM;
406-
my_printf_error(*error_num, ER_SPIDER_INVALID_CONNECT_INFO_STR,
407-
MYF(0), direct_sql->tgt_wrapper);
408-
goto error_alloc_conn;
409-
}
410402
if (!(conn = (SPIDER_CONN *)
411403
spider_bulk_malloc(spider_current_trx, 32, MYF(MY_WME | MY_ZEROFILL),
412404
&conn, sizeof(*conn),
@@ -434,14 +426,6 @@ SPIDER_CONN *spider_udf_direct_sql_create_conn(
434426
conn->default_database.init_calc_mem(138);
435427
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
436428
} else {
437-
if (direct_sql->dbton_id == SPIDER_DBTON_SIZE)
438-
{
439-
/* Invalid target wrapper */
440-
*error_num = ER_SPIDER_NOSQL_WRAPPER_IS_INVALID_NUM;
441-
my_printf_error(*error_num, ER_SPIDER_NOSQL_WRAPPER_IS_INVALID_STR,
442-
MYF(0), direct_sql->tgt_wrapper);
443-
goto error_alloc_conn;
444-
}
445429
if (!(conn = (SPIDER_CONN *)
446430
spider_bulk_malloc(spider_current_trx, 33, MYF(MY_WME | MY_ZEROFILL),
447431
&conn, sizeof(*conn),

0 commit comments

Comments
 (0)