database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-28 17:36:30 +03:00
Code Activity

MDEV-22979 "mysqld --bootstrap" / mysql_install_db hangs when Spider is installed

Browse Source
This commit is contained in:
Kentoku SHIBA
2020-06-25 01:15:35 +09:00
parent d4d42a6ad0
commit e6e41f04f4
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
storage/spider/spd_table.cc
View File

@@ -10039,13 +10039,22 @@ void *spider_table_bg_sts_action(
thd->mysys_var->current_mutex = spd_LOCK_server_started; thd->mysys_var->current_mutex = spd_LOCK_server_started;
if (!(*spd_mysqld_server_started) && !thd->killed) if (!(*spd_mysqld_server_started) && !thd->killed)
{ {
pthread_cond_wait(spd_COND_server_started, spd_LOCK_server_started); do
{
struct timespec abstime;
set_timespec_nsec(abstime, 1000);
error_num = pthread_cond_timedwait(spd_COND_server_started,
spd_LOCK_server_started, &abstime);
} while (
(error_num == ETIMEDOUT || error_num == ETIME) &&
!(*spd_mysqld_server_started) && !thd->killed && !thread->killed
);
} }
pthread_mutex_unlock(spd_LOCK_server_started); pthread_mutex_unlock(spd_LOCK_server_started);
thd->mysys_var->current_cond = &thread->cond; thd->mysys_var->current_cond = &thread->cond;
thd->mysys_var->current_mutex = &thread->mutex; thd->mysys_var->current_mutex = &thread->mutex;
} }
while (spider_init_queries[i].length && !thd->killed) while (spider_init_queries[i].length && !thd->killed && !thread->killed)
{ {
dispatch_command(COM_QUERY, thd, spider_init_queries[i].str, dispatch_command(COM_QUERY, thd, spider_init_queries[i].str,
(uint) spider_init_queries[i].length, FALSE, FALSE); (uint) spider_init_queries[i].length, FALSE, FALSE);