From fc6a7e90ea720d201e9376d4c4c758c717c010a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Sat, 28 Nov 2020 15:00:54 +0200 Subject: [PATCH] row_search_index_entry(): Simplify some assertions --- storage/innobase/row/row0row.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc index aec5377ce14..252312e74e1 100644 --- a/storage/innobase/row/row0row.cc +++ b/storage/innobase/row/row0row.cc @@ -1292,7 +1292,7 @@ row_search_index_entry( ut_ad(dtuple_check_typed(entry)); 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, mode, pcur, mtr); } else { @@ -1301,7 +1301,8 @@ row_search_index_entry( switch (btr_pcur_get_btr_cur(pcur)->flag) { 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); case BTR_CUR_DEL_MARK_IBUF: