diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-11-05 16:15:20 +0100 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 08:52:30 +0100 |
| commit | 3ad37ed0eb343cd173b103974aded5783958a88e (patch) | |
| tree | f4ff854553d26a9e7d57791e7d671d4349a58d2d /storage/innobase/dict/dict0load.cc | |
| parent | 46f2f24ec43e9c1fa2d994afd615f58736c00d65 (diff) | |
| parent | 0339cbe2f628f8a122ba7ea3a75fc99fa1dc4c96 (diff) | |
| download | mariadb-git-3ad37ed0eb343cd173b103974aded5783958a88e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/dict/dict0load.cc')
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index fcaf4b0ab3b..df4786a7e20 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -43,8 +43,7 @@ Created 4/24/1996 Heikki Tuuri #include "rem0cmp.h" #include "srv0start.h" #include "srv0srv.h" -#include <stack> -#include <set> +#include "fts0opt.h" /** Following are the InnoDB system tables. The positions in this array are referenced by enum dict_system_table_id. */ @@ -3079,8 +3078,12 @@ func_exit: FTS */ fts_optimize_remove_table(table); fts_free(table); - } else { + } else if (fts_optimize_wq) { fts_optimize_add_table(table); + } else { + /* fts_optimize_thread is not started yet. + So make the table as non-evictable from cache. */ + dict_sys.prevent_eviction(table); } } |