diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-15 19:11:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-15 19:11:57 +0300 |
| commit | 3d0bb2b7f1eb39d1b3773e634499ff98576679f7 (patch) | |
| tree | 01df0eedeb5be736010b92f6373fe39d547e1b2b /storage/innobase/dict/dict0mem.cc | |
| parent | 6a6bcc53b8767dfbb4dc86bad3e90a276c55f605 (diff) | |
| parent | ad6171b91cac33e70bb28fa6865488b2c65e858c (diff) | |
| download | mariadb-git-3d0bb2b7f1eb39d1b3773e634499ff98576679f7.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/dict/dict0mem.cc')
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index 5aea4678ab8..f380feff7ef 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -148,6 +148,9 @@ dict_mem_table_create( lock_table_lock_list_init(&table->locks); UT_LIST_INIT(table->indexes, &dict_index_t::indexes); +#ifdef BTR_CUR_HASH_ADAPT + UT_LIST_INIT(table->freed_indexes, &dict_index_t::indexes); +#endif /* BTR_CUR_HASH_ADAPT */ table->heap = heap; @@ -204,6 +207,10 @@ dict_mem_table_free( { ut_ad(table); ut_ad(table->magic_n == DICT_TABLE_MAGIC_N); + ut_ad(UT_LIST_GET_LEN(table->indexes) == 0); +#ifdef BTR_CUR_HASH_ADAPT + ut_ad(UT_LIST_GET_LEN(table->freed_indexes) == 0); +#endif /* BTR_CUR_HASH_ADAPT */ ut_d(table->cached = FALSE); if (dict_table_has_fts_index(table) |