diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-01 13:33:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-01 13:33:51 +0300 |
| commit | d99f787244ab82f658b3f4a6c9877289e6385e04 (patch) | |
| tree | 3fcef4af5b2fe94e1a1571450680968025197cd0 | |
| parent | 323500bfa9a8f80ca210f4a010ad6a4b5bba689d (diff) | |
| parent | d6b33ea237c620923a7d4458a5907be0738c821d (diff) | |
| download | mariadb-git-d99f787244ab82f658b3f4a6c9877289e6385e04.tar.gz | |
Merge 10.2 into 10.3
| -rw-r--r-- | storage/innobase/fts/fts0opt.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc index 00ace70291b..be5a5800c58 100644 --- a/storage/innobase/fts/fts0opt.cc +++ b/storage/innobase/fts/fts0opt.cc @@ -2604,9 +2604,13 @@ fts_optimize_remove_table( os_event_destroy(event); - ut_d(mutex_enter(&fts_optimize_wq->mutex)); - ut_ad(!table->fts->in_queue); - ut_d(mutex_exit(&fts_optimize_wq->mutex)); +#ifdef UNIV_DEBUG + if (!fts_opt_start_shutdown) { + mutex_enter(&fts_optimize_wq->mutex); + ut_ad(!table->fts->in_queue); + mutex_exit(&fts_optimize_wq->mutex); + } +#endif /* UNIV_DEBUG */ } /** Send sync fts cache for the table. |