Commit 240e62b8 authored by Kentoku SHIBA's avatar Kentoku SHIBA

fix MDEV-4735 Assertion `! is_set()' fails in Diagnostics_area::set_ok_status...

fix MDEV-4735 Assertion `! is_set()' fails in Diagnostics_area::set_ok_status on attempt to create a temporary SPIDER table connecting to non-existing source
parent 708a28ff
...@@ -4512,18 +4512,24 @@ SPIDER_SHARE *spider_get_share( ...@@ -4512,18 +4512,24 @@ SPIDER_SHARE *spider_get_share(
} }
} }
spider_get_sts(share, spider->search_link_idx, tmp_time, if (spider_get_sts(share, spider->search_link_idx, tmp_time,
spider, sts_interval, sts_mode, spider, sts_interval, sts_mode,
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
sts_sync, sts_sync,
#endif #endif
1, HA_STATUS_VARIABLE | HA_STATUS_CONST | HA_STATUS_AUTO); 1, HA_STATUS_VARIABLE | HA_STATUS_CONST | HA_STATUS_AUTO))
spider_get_crd(share, spider->search_link_idx, tmp_time, {
thd->clear_error();
}
if (spider_get_crd(share, spider->search_link_idx, tmp_time,
spider, table, crd_interval, crd_mode, spider, table, crd_interval, crd_mode,
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
crd_sync, crd_sync,
#endif #endif
1); 1))
{
thd->clear_error();
}
/* /*
if ( if (
(*error_num = spider_get_sts(share, spider->search_link_idx, tmp_time, (*error_num = spider_get_sts(share, spider->search_link_idx, tmp_time,
...@@ -4935,18 +4941,24 @@ SPIDER_SHARE *spider_get_share( ...@@ -4935,18 +4941,24 @@ SPIDER_SHARE *spider_get_share(
} }
} }
spider_get_sts(share, spider->search_link_idx, if (spider_get_sts(share, spider->search_link_idx,
tmp_time, spider, sts_interval, sts_mode, tmp_time, spider, sts_interval, sts_mode,
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
sts_sync, sts_sync,
#endif #endif
1, HA_STATUS_VARIABLE | HA_STATUS_CONST | HA_STATUS_AUTO); 1, HA_STATUS_VARIABLE | HA_STATUS_CONST | HA_STATUS_AUTO))
spider_get_crd(share, spider->search_link_idx, {
thd->clear_error();
}
if (spider_get_crd(share, spider->search_link_idx,
tmp_time, spider, table, crd_interval, crd_mode, tmp_time, spider, table, crd_interval, crd_mode,
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
crd_sync, crd_sync,
#endif #endif
1); 1))
{
thd->clear_error();
}
/* /*
if ( if (
(*error_num = spider_get_sts(share, spider->search_link_idx, (*error_num = spider_get_sts(share, spider->search_link_idx,
......
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