Skip to content

M
MariaDB
Commit fc6a7e90 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

row_search_index_entry(): Simplify some assertions

parent 1fdc161d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
storage/innobase/row/row0row.cc
View file @ fc6a7e90
...@@ -1292,7 +1292,7 @@ row_search_index_entry( ...@@ -1292,7 +1292,7 @@ row_search_index_entry(
ut_ad(dtuple_check_typed(entry)); ut_ad(dtuple_check_typed(entry));
if (dict_index_is_spatial(index)) { if (dict_index_is_spatial(index)) {
ut_ad(mode & BTR_MODIFY_LEAF || mode & BTR_MODIFY_TREE); ut_ad(mode & (BTR_MODIFY_LEAF | BTR_MODIFY_TREE));
rtr_pcur_open(index, entry, PAGE_CUR_RTREE_LOCATE, rtr_pcur_open(index, entry, PAGE_CUR_RTREE_LOCATE,
mode, pcur, mtr); mode, pcur, mtr);
} else { } else {
...@@ -1301,7 +1301,8 @@ row_search_index_entry( ...@@ -1301,7 +1301,8 @@ row_search_index_entry(
switch (btr_pcur_get_btr_cur(pcur)->flag) { switch (btr_pcur_get_btr_cur(pcur)->flag) {
case BTR_CUR_DELETE_REF: case BTR_CUR_DELETE_REF:
ut_a(mode & BTR_DELETE && !dict_index_is_spatial(index)); ut_ad(mode & BTR_DELETE);
ut_ad(!index->is_spatial());
return(ROW_NOT_DELETED_REF); return(ROW_NOT_DELETED_REF);
case BTR_CUR_DEL_MARK_IBUF: case BTR_CUR_DEL_MARK_IBUF:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7