MDEV-22761: innodb row_search_idx_cond_check handle CHECK_ABORTED_BY_…

…USER

Part #3:
Two more cases within row_search_mvcc need to handle the CHECK_ABORTED_BY_USER
and process this as a DB_INTERRUPTED.

storage/innobase/row/row0sel.cc

@@ -4453,9 +4453,12 @@ row_search_mvcc(
 					switch (row_search_idx_cond_check(
 							buf, prebuilt,
 							rec, offsets)) {
+                                        case CHECK_ABORTED_BY_USER:
+						err = DB_INTERRUPTED;
+						mtr.commit();
+						goto func_exit;
 					case CHECK_NEG:
 					case CHECK_OUT_OF_RANGE:
-                                        case CHECK_ABORTED_BY_USER:
                                         case CHECK_ERROR:
 						goto shortcut_mismatch;
 					case CHECK_POS:
@@ -5239,8 +5242,10 @@ row_search_mvcc(
 						buf, prebuilt, rec, offsets)) {
 				case CHECK_NEG:
 					goto next_rec;
-				case CHECK_OUT_OF_RANGE:
                                 case CHECK_ABORTED_BY_USER:
+					err = DB_INTERRUPTED;
+					goto idx_cond_failed;
+				case CHECK_OUT_OF_RANGE:
                                 case CHECK_ERROR:
 					err = DB_RECORD_NOT_FOUND;
 					goto idx_cond_failed;