row_search_index_entry(): Simplify some assertions

MariaDB · Nov 30, 2020 · fc6a7e9 · fc6a7e9
1 parent 1fdc161
commit fc6a7e9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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: