diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 10:34:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 10:34:33 +0200 |
| commit | 77e8a311e1f919f15845c75d08de4340965c0bc4 (patch) | |
| tree | 7afc1e49694bb16fcdc07495a294a8d89b62f5eb /storage/innobase/dict/dict0load.cc | |
| parent | 3ad37ed0eb343cd173b103974aded5783958a88e (diff) | |
| parent | c24ec3cece6d8bf70dac7519b6fd397c464f7a82 (diff) | |
| download | mariadb-git-77e8a311e1f919f15845c75d08de4340965c0bc4.tar.gz | |
Merge 10.4 into 10.5
A conflict between MDEV-19514 (b42294bc6409794bdbd2051b32fa079d81cea61d)
and MDEV-20934 (d7a2401750bb29dfdb45929a536539b9f17b347f)
was resolved. We will not invoke the function ibuf_delete_recs()
from ibuf_merge_or_delete_for_page(). Instead, we will add that
logic to the function ibuf_read_merge_pages().
Diffstat (limited to 'storage/innobase/dict/dict0load.cc')
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index df4786a7e20..2cf4410b936 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -2566,8 +2566,9 @@ corrupted: and simply did not load this index definition, the .frm file would disagree with the index definitions inside InnoDB. */ - if (!dict_index_add_to_cache( - index, index->page, false, &error)) { + if ((error = dict_index_add_to_cache(index, + index->page)) + != DB_SUCCESS) { goto func_exit; } } @@ -3080,7 +3081,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_sys.prevent_eviction(table); |