diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-18 16:24:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-18 16:24:48 +0300 |
| commit | bb4214272a8a1b0e60a785e1bf1391d5753b73b6 (patch) | |
| tree | 27d4dd0eff246902f9f25c102cf5f5aa9d10a05d /storage/innobase/trx | |
| parent | 24859049c6b2d0b6f83f1f93ced15414d7266fb6 (diff) | |
| parent | 8a79fa0e4d0385818da056f7a4a39fde95d62fe3 (diff) | |
| download | mariadb-git-bb4214272a8a1b0e60a785e1bf1391d5753b73b6.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index b06e15d4f37..88fe5e548a9 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1457,26 +1457,14 @@ trx_finalize_for_fts_table( fts_t* fts = ftt->table->fts; fts_doc_ids_t* doc_ids = ftt->added_doc_ids; - mutex_enter(&fts->bg_threads_mutex); + ut_a(fts->add_wq); - if (fts->fts_status & BG_THREAD_STOP) { - /* The table is about to be dropped, no use - adding anything to its work queue. */ + mem_heap_t* heap = static_cast<mem_heap_t*>(doc_ids->self_heap->arg); - mutex_exit(&fts->bg_threads_mutex); - } else { - mem_heap_t* heap; - mutex_exit(&fts->bg_threads_mutex); - - ut_a(fts->add_wq); - - heap = static_cast<mem_heap_t*>(doc_ids->self_heap->arg); + ib_wqueue_add(fts->add_wq, doc_ids, heap); - ib_wqueue_add(fts->add_wq, doc_ids, heap); - - /* fts_trx_table_t no longer owns the list. */ - ftt->added_doc_ids = NULL; - } + /* fts_trx_table_t no longer owns the list. */ + ftt->added_doc_ids = NULL; } /******************************************************************//** |