diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 17:08:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 17:50:41 +0200 |
| commit | bae21bfb5de17328c33c3da8d191c6d3af14ae02 (patch) | |
| tree | a7dfd9267b98eb490564df94ca253d953b128f5a /storage/innobase/fts/fts0fts.cc | |
| parent | d63e19806108efc1ca8d533841ad2471f2e0c4fe (diff) | |
| parent | db55b39fb29979acd3c58581e34f8e51507a1792 (diff) | |
| download | mariadb-git-bae21bfb5de17328c33c3da8d191c6d3af14ae02.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/innobase/fts/fts0fts.cc')
| -rw-r--r-- | storage/innobase/fts/fts0fts.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index 5cbb7d9f77e..75258bb8610 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -870,19 +870,19 @@ fts_drop_index( err = fts_drop_index_tables(trx, index); while (index->index_fts_syncing - && !trx_is_interrupted(trx)) { - DICT_BG_YIELD(trx); - } + && !trx_is_interrupted(trx)) { + DICT_BG_YIELD(trx); + } - fts_free(table); + fts_free(table); return(err); } while (index->index_fts_syncing - && !trx_is_interrupted(trx)) { - DICT_BG_YIELD(trx); - } + && !trx_is_interrupted(trx)) { + DICT_BG_YIELD(trx); + } current_doc_id = table->fts->cache->next_doc_id; first_doc_id = table->fts->cache->first_doc_id; @@ -901,9 +901,9 @@ fts_drop_index( if (index_cache != NULL) { while (index->index_fts_syncing - && !trx_is_interrupted(trx)) { - DICT_BG_YIELD(trx); - } + && !trx_is_interrupted(trx)) { + DICT_BG_YIELD(trx); + } if (index_cache->words) { fts_words_free(index_cache->words); rbt_free(index_cache->words); |