diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 17:07:09 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 17:07:09 +0300 |
commit | ed41947b783ed360127a8eff9a73cbaa79f53e94 (patch) | |
tree | ec730876dee29e084602b8388b356c169bdbbfc6 | |
parent | 21e71766f66b06281d9e3f3b1dc0ad6eb11e1318 (diff) | |
parent | 22a6fa572b8681edb61d250fd2a41c93ea7d448e (diff) | |
download | mariadb-git-ed41947b783ed360127a8eff9a73cbaa79f53e94.tar.gz |
Merge 10.2 into 10.3
-rw-r--r-- | storage/innobase/row/row0ins.cc | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 56c5226f278..48fe057df20 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -61,35 +61,22 @@ check. If you make a change in this module make sure that no codepath is introduced where a call to log_free_check() is bypassed. */ -/***********************************************************//** -Creates an entry template for each index of a table. */ -static -void -ins_node_create_entry_list( -/*=======================*/ - ins_node_t* node) /*!< in: row insert node */ +/** Create an row template for each index of a table. */ +static void ins_node_create_entry_list(ins_node_t *node) { - dict_index_t* index; - dtuple_t* entry; - - ut_ad(node->entry_sys_heap); - - /* We will include all indexes (include those corrupted - secondary indexes) in the entry list. Filtration of - these corrupted index will be done in row_ins() */ - - node->entry_list.reserve(UT_LIST_GET_LEN(node->table->indexes)); - - for (index = dict_table_get_first_index(node->table); - index != 0; - index = dict_table_get_next_index(index)) { - - entry = row_build_index_entry_low( - node->row, NULL, index, node->entry_sys_heap, - ROW_BUILD_FOR_INSERT); - - node->entry_list.push_back(entry); - } + node->entry_list.reserve(UT_LIST_GET_LEN(node->table->indexes)); + + for (dict_index_t *index= dict_table_get_first_index(node->table); index; + index= dict_table_get_next_index(index)) + { + /* Corrupted or incomplete secondary indexes will be filtered out in + row_ins(). */ + dtuple_t *entry= index->online_status >= ONLINE_INDEX_ABORTED + ? dtuple_create(node->entry_sys_heap, 0) + : row_build_index_entry_low(node->row, NULL, index, node->entry_sys_heap, + ROW_BUILD_FOR_INSERT); + node->entry_list.push_back(entry); + } } /*****************************************************************//** |