diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-01 13:41:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-01 13:41:36 +0300 |
| commit | 9ae608d24d9f2a32e90a3e6130a67199f7e549e5 (patch) | |
| tree | 1978bcd08e1f1e02142c552d9722c59449ac669f /storage/innobase/fts/fts0opt.cc | |
| parent | 79e32e47a11150839ac4ab44ac02d4019c0e0019 (diff) | |
| parent | d99f787244ab82f658b3f4a6c9877289e6385e04 (diff) | |
| download | mariadb-git-9ae608d24d9f2a32e90a3e6130a67199f7e549e5.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/fts/fts0opt.cc')
| -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 a14481345f6..dcd613aa933 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. |