diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2013-09-19 03:05:52 +0900 |
|---|---|---|
| committer | Kentoku SHIBA <kentokushiba@gmail.com> | 2013-09-19 03:05:52 +0900 |
| commit | 240e62b8906bd07515104e976e86c09987a9a73d (patch) | |
| tree | 14744448eb0089aa099a747fd6eae898c3070eb4 /storage/spider | |
| parent | 708a28ff7911c68ed5358cd5ebf4db8c534041ed (diff) | |
| download | mariadb-git-240e62b8906bd07515104e976e86c09987a9a73d.tar.gz | |
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
Diffstat (limited to 'storage/spider')
| -rw-r--r-- | storage/spider/spd_table.cc | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index 3f67d1f5edf..0e66bf275c9 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -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, #ifdef WITH_PARTITION_STORAGE_ENGINE sts_sync, #endif - 1, HA_STATUS_VARIABLE | HA_STATUS_CONST | HA_STATUS_AUTO); - spider_get_crd(share, spider->search_link_idx, tmp_time, + 1, HA_STATUS_VARIABLE | HA_STATUS_CONST | HA_STATUS_AUTO)) + { + thd->clear_error(); + } + if (spider_get_crd(share, spider->search_link_idx, tmp_time, spider, table, crd_interval, crd_mode, #ifdef WITH_PARTITION_STORAGE_ENGINE crd_sync, #endif - 1); + 1)) + { + thd->clear_error(); + } /* if ( (*error_num = spider_get_sts(share, spider->search_link_idx, tmp_time, @@ -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, #ifdef WITH_PARTITION_STORAGE_ENGINE sts_sync, #endif - 1, HA_STATUS_VARIABLE | HA_STATUS_CONST | HA_STATUS_AUTO); - spider_get_crd(share, spider->search_link_idx, + 1, HA_STATUS_VARIABLE | HA_STATUS_CONST | HA_STATUS_AUTO)) + { + thd->clear_error(); + } + if (spider_get_crd(share, spider->search_link_idx, tmp_time, spider, table, crd_interval, crd_mode, #ifdef WITH_PARTITION_STORAGE_ENGINE crd_sync, #endif - 1); + 1)) + { + thd->clear_error(); + } /* if ( (*error_num = spider_get_sts(share, spider->search_link_idx, |