diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 20:37:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 20:37:52 +0300 |
| commit | 101ddc5e2708e4e32f1aaa7a02fe85f0da95b73a (patch) | |
| tree | 11747103367332f63928220376b5093b9e2ebdc5 /storage/innobase/fts/fts0fts.cc | |
| parent | 2b9c53102c7c7428279c5fd02f771d335b5c53dc (diff) | |
| parent | ddffcad64c9ff3299037eed9df1bc92d51f8d07e (diff) | |
| download | mariadb-git-101ddc5e2708e4e32f1aaa7a02fe85f0da95b73a.tar.gz | |
Merge mariadb-10.4.14
Diffstat (limited to 'storage/innobase/fts/fts0fts.cc')
| -rw-r--r-- | storage/innobase/fts/fts0fts.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index 199941e71f8..fafdda16429 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -1105,9 +1105,6 @@ fts_cache_clear( index_cache->doc_stats = NULL; } - mem_heap_free(static_cast<mem_heap_t*>(cache->sync_heap->arg)); - cache->sync_heap->arg = NULL; - fts_need_sync = false; cache->total_size = 0; @@ -1115,6 +1112,9 @@ fts_cache_clear( mutex_enter((ib_mutex_t*) &cache->deleted_lock); cache->deleted_doc_ids = NULL; mutex_exit((ib_mutex_t*) &cache->deleted_lock); + + mem_heap_free(static_cast<mem_heap_t*>(cache->sync_heap->arg)); + cache->sync_heap->arg = NULL; } /*********************************************************************//** |