mirror of
https://github.com/MariaDB/server.git
synced 2025-12-04 17:23:46 +03:00
MDEV-22787 postfix
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:
@@ -42,6 +42,7 @@ ib_wqueue_t* fts_optimize_wq;
|
||||
static void fts_optimize_callback(void *);
|
||||
static void timer_callback(void*);
|
||||
static tpool::timer* timer;
|
||||
|
||||
static tpool::task_group task_group(1);
|
||||
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
|
||||
can't delete the work queue here because the add thread needs
|
||||
deregister the FTS tables. */
|
||||
timer->disarm();
|
||||
task_group.cancel_pending(&task);
|
||||
|
||||
msg = fts_optimize_create_msg(FTS_MSG_STOP, NULL);
|
||||
|
||||
Reference in New Issue
Block a user