diff options
| author | Jacob Mathew <jacob.mathew@mariadb.com> | 2018-04-02 19:12:12 -0700 |
|---|---|---|
| committer | Jacob Mathew <jacob.mathew@mariadb.com> | 2018-04-02 19:12:12 -0700 |
| commit | 1eee986e0c6ef558422b820aa81a196b7f9a523e (patch) | |
| tree | 3cbc863bbdf53212bf43b8f0090cdae2fddcac81 | |
| parent | 131ed6c27362aa6239f829d52cf37dce2bc0bae9 (diff) | |
| download | mariadb-git-1eee986e0c6ef558422b820aa81a196b7f9a523e.tar.gz | |
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.
| -rw-r--r-- | storage/spider/spd_direct_sql.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/storage/spider/spd_direct_sql.cc b/storage/spider/spd_direct_sql.cc index d0c72674de2..4d69d9af615 100644 --- a/storage/spider/spd_direct_sql.cc +++ b/storage/spider/spd_direct_sql.cc @@ -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), |