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/row/row0merge.cc | |
| parent | 6a6bcc53b8767dfbb4dc86bad3e90a276c55f605 (diff) | |
| parent | ad6171b91cac33e70bb28fa6865488b2c65e858c (diff) | |
| download | mariadb-git-3d0bb2b7f1eb39d1b3773e634499ff98576679f7.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 3e61882fbbd..20a30fdfe05 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -46,6 +46,9 @@ Completed by Sunny Bains and Marko Makela #include "row0vers.h" #include "handler0alter.h" #include "btr0bulk.h" +#ifdef BTR_CUR_ADAPT +# include "btr0sea.h" +#endif /* BTR_CUR_ADAPT */ #include "ut0stage.h" #include "fil0crypt.h" @@ -203,7 +206,6 @@ public: &ins_cur, 0, __FILE__, __LINE__, &mtr); - error = btr_cur_pessimistic_insert( flag, &ins_cur, &ins_offsets, &row_heap, dtuple, &rec, @@ -3912,6 +3914,9 @@ row_merge_drop_indexes( we should exclude FTS entries from prebuilt->ins_node->entry_list in ins_node_create_entry_list(). */ +#ifdef BTR_CUR_HASH_ADAPT + ut_ad(!index->search_info->ref_count); +#endif /* BTR_CUR_HASH_ADAPT */ dict_index_remove_from_cache( table, index); index = prev; |