diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-23 17:25:56 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-29 20:47:37 +0300 |
commit | 428e02895b4464e12ed0d76064ae49b03300861f (patch) | |
tree | 7f6d682e97fd453f0b1c23f4518a79d73c01289e /storage/innobase/ibuf | |
parent | 604fea1ad6d7b0463e5a30471a04b3b417467df9 (diff) | |
download | mariadb-git-428e02895b4464e12ed0d76064ae49b03300861f.tar.gz |
MDEV-12266: Remove dict_index_t::table_name
Replace index->table_name with index->table->name.
Diffstat (limited to 'storage/innobase/ibuf')
-rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index a337be68ff9..07c4f0de4bc 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -560,11 +560,11 @@ ibuf_init_at_db_start(void) mtr.commit(); ibuf->index = dict_mem_index_create( - "innodb_change_buffer", "CLUST_IND", + dict_mem_table_create("innodb_change_buffer", + IBUF_SPACE_ID, 1, 0, 0, 0), + "CLUST_IND", DICT_CLUSTERED | DICT_IBUF, 1); ibuf->index->id = DICT_IBUF_ID_MIN + IBUF_SPACE_ID; - ibuf->index->table = dict_mem_table_create( - "innodb_change_buffer", IBUF_SPACE_ID, 1, 0, 0, 0); ibuf->index->n_uniq = REC_MAX_N_FIELDS; rw_lock_create(index_tree_rw_lock_key, &ibuf->index->lock, SYNC_IBUF_INDEX_TREE); @@ -1498,9 +1498,7 @@ ibuf_dummy_index_create( DICT_HDR_SPACE, n, 0, comp ? DICT_TF_COMPACT : 0, 0); - index = dict_mem_index_create("IBUF_DUMMY", "IBUF_DUMMY", 0, n); - - index->table = table; + index = dict_mem_index_create(table, "IBUF_DUMMY", 0, n); /* avoid ut_ad(index->cached) in dict_index_get_n_unique_in_tree */ index->cached = TRUE; |