summaryrefslogtreecommitdiff
path: root/storage/innobase/dict/dict0load.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-11-06 10:18:51 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-11-06 10:18:51 +0200
commit8688ef22c21b810e7d5d4732a3f73035eb171879 (patch)
treecbcea402e9c8039e5752c71e1193985406777f2d /storage/innobase/dict/dict0load.cc
parentd7a2401750bb29dfdb45929a536539b9f17b347f (diff)
parent4e99e67c4e8a04bd03cb0e7efc2ce0129af60c34 (diff)
downloadmariadb-git-8688ef22c21b810e7d5d4732a3f73035eb171879.tar.gz
Merge 10.1 to 10.2
Diffstat (limited to 'storage/innobase/dict/dict0load.cc')
-rw-r--r--storage/innobase/dict/dict0load.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc
index 06432f091f5..8ed947f04cf 100644
--- a/storage/innobase/dict/dict0load.cc
+++ b/storage/innobase/dict/dict0load.cc
@@ -3122,7 +3122,7 @@ func_exit:
fts_free(table);
} else if (fts_optimize_wq) {
fts_optimize_add_table(table);
- } else {
+ } else if (table->can_be_evicted) {
/* fts_optimize_thread is not started yet.
So make the table as non-evictable from cache. */
dict_table_move_from_lru_to_non_lru(table);