database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-04 17:23:46 +03:00
Code Activity

MDEV-22787 postfix

Browse Source 
Ensure that FTS_MSG_STOP is the very last message, and nothing comes after
it in fts_optimize_shutdown.

Stop the timer to ensure that.
This commit is contained in:
Vladislav Vaintroub
2020-06-03 17:39:33 +02:00
parent 4c52223493
commit e7bab059b7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/fts/fts0opt.cc
View File

@@ -42,6 +42,7 @@ ib_wqueue_t* fts_optimize_wq;
static void fts_optimize_callback(void *); static void fts_optimize_callback(void *);
static void timer_callback(void*); static void timer_callback(void*);
static tpool::timer* timer; static tpool::timer* timer;
static tpool::task_group task_group(1); static tpool::task_group task_group(1);
static tpool::task task(fts_optimize_callback,0, &task_group); static tpool::task task(fts_optimize_callback,0, &task_group);
@@ -3014,6 +3015,7 @@ fts_optimize_shutdown()
/* We tell the OPTIMIZE thread to switch to state done, we /* We tell the OPTIMIZE thread to switch to state done, we
can't delete the work queue here because the add thread needs can't delete the work queue here because the add thread needs
deregister the FTS tables. */ deregister the FTS tables. */
timer->disarm();
task_group.cancel_pending(&task); task_group.cancel_pending(&task);
msg = fts_optimize_create_msg(FTS_MSG_STOP, NULL); msg = fts_optimize_create_msg(FTS_MSG_STOP, NULL);