diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2014-03-25 04:39:17 +0900 |
|---|---|---|
| committer | Kentoku SHIBA <kentokushiba@gmail.com> | 2014-03-25 04:39:17 +0900 |
| commit | 92fb1f3b6aa7aac05c4e68f4098a9e310b45ee42 (patch) | |
| tree | e39551748edf5cc8b6f7f82b296ffc6378eeedb8 /storage/spider | |
| parent | 20e144a667e40fc86f553a03a03cde4cfff1204d (diff) | |
| download | mariadb-git-92fb1f3b6aa7aac05c4e68f4098a9e310b45ee42.tar.gz | |
MDEV-5299 crash at using show index
Diffstat (limited to 'storage/spider')
| -rw-r--r-- | storage/spider/ha_spider.cc | 32 | ||||
| -rw-r--r-- | storage/spider/spd_trx.cc | 4 |
2 files changed, 30 insertions, 6 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index a47e8f770d2..6d22d71c81d 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -8101,10 +8101,30 @@ int ha_spider::info( pthread_mutex_lock(&share->sts_mutex); if (difftime(tmp_time, share->sts_get_time) >= sts_interval) { - if ( - (error_num = spider_check_trx_and_get_conn(ha_thd(), this, - FALSE)) || - (error_num = spider_get_sts(share, search_link_idx, tmp_time, + if ((error_num = spider_check_trx_and_get_conn(ha_thd(), this, + FALSE))) + { + if (!share->sts_init) + { + if ( + spider_init_error_table || + (spider_init_error_table = + spider_get_init_error_table(trx, share, TRUE)) + ) { + spider_init_error_table->init_error = error_num; + if ((spider_init_error_table->init_error_with_message = + thd->is_error())) + strmov(spider_init_error_table->init_error_msg, + spider_stmt_da_message(thd)); + spider_init_error_table->init_error_time = + (time_t) time((time_t*) 0); + } + share->init_error = TRUE; + share->init = TRUE; + } + DBUG_RETURN(check_error_mode(error_num)); + } + if ((error_num = spider_get_sts(share, search_link_idx, tmp_time, this, sts_interval, sts_mode, #ifdef WITH_PARTITION_STORAGE_ENGINE sts_sync, @@ -8546,6 +8566,10 @@ int ha_spider::check_crd() } if (crd_mode == 3) crd_mode = 1; + if ((error_num = spider_check_trx_and_get_conn(ha_thd(), this, FALSE))) + { + DBUG_RETURN(check_error_mode(error_num)); + } dbton_id = share->sql_dbton_ids[search_link_idx]; dbton_hdl = dbton_handler[dbton_id]; crd_mode = dbton_hdl->crd_mode_exchange(crd_mode); diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc index 129d9fd1d63..2694b188dc6 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc @@ -3425,8 +3425,6 @@ int spider_check_trx_and_get_conn( DBUG_PRINT("info",("spider semi_table_lock = %d", spider_param_semi_table_lock(thd, share->semi_table_lock))); DBUG_PRINT("info",("spider first_byte = %d", first_byte)); - DBUG_PRINT("info",("spider link_status = %ld", - share->link_statuses[spider->conn_link_idx[spider->search_link_idx]])); if ( !trx_ha || trx_ha->wait_for_reusing || @@ -3618,6 +3616,8 @@ int spider_check_trx_and_get_conn( #endif } } else { + DBUG_PRINT("info",("spider link_status = %ld", + share->link_statuses[spider->conn_link_idx[spider->search_link_idx]])); for ( roop_count = spider_conn_link_idx_next(share->link_statuses, spider->conn_link_idx, -1, share->link_count, |