Skip to content
/ server Public

Commit 35183f0

Browse files
MDEV-38694 [check-ci] Clean up unfinished spider bg thread in index_end
1 parent 104b7da commit 35183f0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

sql/ha_partition.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6094,7 +6094,7 @@ int ha_partition::common_index_read(uchar *buf, bool have_start_key)
60946094
The unordered index scan will use the partition set created.
60956095
*/
60966096
DBUG_PRINT("info", ("doing unordered scan"));
6097-
error= handle_pre_scan(reverse_order, FALSE);
6097+
error= handle_pre_scan(reverse_order, check_parallel_search());
60986098
if (likely(!error))
60996099
error= handle_unordered_scan_next_partition(buf, reverse_order);
61006100
}

storage/spider/ha_spider.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,6 +1227,9 @@ int ha_spider::index_end()
12271227
backup_error_status();
12281228
DBUG_ENTER("ha_spider::index_end");
12291229
DBUG_PRINT("info",("spider this=%p", this));
1230+
if (result_list.bgs_working &&
1231+
(error_num = spider_bg_all_conn_pre_next(this, search_link_idx)))
1232+
DBUG_RETURN(error_num);
12301233
active_index = MAX_KEY;
12311234
if ((error_num = drop_tmp_tables()))
12321235
DBUG_RETURN(check_error_mode(error_num));

0 commit comments

Comments
 (0)