Skip to content

M
MariaDB
Commit 1ddff751 authored by Kentoku SHIBA's avatar Kentoku SHIBA
Browse files
Options

MENT-807 Crash with CREATE TEMPORARY TABLE .. ENGINE=SPIDER .. wrapper "odbc"

parent 09be96ff
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
storage/spider/spd_table.cc
View file @ 1ddff751
...@@ -6323,6 +6323,7 @@ int spider_free_share( ...@@ -6323,6 +6323,7 @@ int spider_free_share(
#endif #endif
if ( if (
share->sts_init && share->sts_init &&
share->table_share->tmp_table == NO_TMP_TABLE &&
spider_param_store_last_sts(share->store_last_sts) spider_param_store_last_sts(share->store_last_sts)
) { ) {
if (!thd) if (!thd)
...@@ -6343,6 +6344,7 @@ int spider_free_share( ...@@ -6343,6 +6344,7 @@ int spider_free_share(
} }
if ( if (
share->crd_init && share->crd_init &&
share->table_share->tmp_table == NO_TMP_TABLE &&
spider_param_store_last_crd(share->store_last_crd) spider_param_store_last_crd(share->store_last_crd)
) { ) {
if (!thd) if (!thd)
...@@ -8171,6 +8173,7 @@ int spider_get_sts( ...@@ -8171,6 +8173,7 @@ int spider_get_sts(
#endif #endif
if ( if (
!share->sts_init && !share->sts_init &&
share->table_share->tmp_table == NO_TMP_TABLE &&
spider_param_load_sts_at_startup(share->load_sts_at_startup) && spider_param_load_sts_at_startup(share->load_sts_at_startup) &&
(!share->init || share->init_error) (!share->init || share->init_error)
) { ) {
...@@ -8321,6 +8324,7 @@ int spider_get_crd( ...@@ -8321,6 +8324,7 @@ int spider_get_crd(
#endif #endif
if ( if (
!share->crd_init && !share->crd_init &&
share->table_share->tmp_table == NO_TMP_TABLE &&
spider_param_load_sts_at_startup(share->load_crd_at_startup) spider_param_load_sts_at_startup(share->load_crd_at_startup)
) { ) {
error_num = spider_sys_get_table_crd( error_num = spider_sys_get_table_crd(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7