mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
MDEV-21903 FTS optimize thread aborts during shutdown
- This issue was caused by 5e62b6a5e0
.
fts_optimize_callback() should free fts_optimize_wq and make it as NULL
when it receives FTS_MSG_STOP message. So that subsequent
fts_optimize_callback() doesn't fail with segmentation fault.
This commit is contained in:
parent
e74c1c9ece
commit
c58686447f
1 changed files with 3 additions and 2 deletions
|
@ -2936,6 +2936,9 @@ static void fts_optimize_callback(void *)
|
|||
ib_vector_free(fts_slots);
|
||||
fts_slots = NULL;
|
||||
|
||||
ib_wqueue_free(fts_optimize_wq);
|
||||
fts_optimize_wq = NULL;
|
||||
|
||||
innobase_destroy_background_thd(fts_opt_thd);
|
||||
ib::info() << "FTS optimize thread exiting.";
|
||||
|
||||
|
@ -3023,8 +3026,6 @@ fts_optimize_shutdown()
|
|||
os_event_wait(fts_opt_shutdown_event);
|
||||
|
||||
os_event_destroy(fts_opt_shutdown_event);
|
||||
ib_wqueue_free(fts_optimize_wq);
|
||||
fts_optimize_wq = NULL;
|
||||
fts_opt_thd = NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue