summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKentoku SHIBA <kentokushiba@gmail.com>2019-07-30 01:30:14 +0900
committerGitHub <noreply@github.com>2019-07-30 01:30:14 +0900
commit7221b9ef520a18bb834855fe0deb37e4a390ec14 (patch)
tree227f6df181ab2c40e337450ed22377fd362ebf1d
parentccaaa3d200dccddd8ff3defafcff8ae6f4dcf9ae (diff)
downloadmariadb-git-7221b9ef520a18bb834855fe0deb37e4a390ec14.tar.gz
MDEV-20179 Server hangs on shutdown during installation of Spider (#1367)
-rw-r--r--storage/spider/spd_table.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
index ebc784608e3..718591fc7cf 100644
--- a/storage/spider/spd_table.cc
+++ b/storage/spider/spd_table.cc
@@ -10039,6 +10039,8 @@ void *spider_table_bg_sts_action(
}
++i;
}
+ thd->mysys_var->current_cond = &thread->cond;
+ thd->mysys_var->current_mutex = &thread->mutex;
DBUG_PRINT("info",("spider first_free_wait=%s",
thread->first_free_wait ? "TRUE" : "FALSE"));
if (!thread->first_free_wait && !thd->killed)
@@ -10067,6 +10069,8 @@ void *spider_table_bg_sts_action(
}
++i;
}
+ thd->mysys_var->current_cond = &thread->cond;
+ thd->mysys_var->current_mutex = &thread->mutex;
thd->client_capabilities -= CLIENT_MULTI_RESULTS;
reenable_binlog(thd);
thread->init_command = FALSE;