database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

MDEV-22761: innodb row_search_idx_cond_check handle CHECK_ABORTED_BY_USER

Browse Source 
Part #3:
Two more cases within row_search_mvcc need to handle the CHECK_ABORTED_BY_USER
and process this as a DB_INTERRUPTED.
This commit is contained in:
Daniel Black
2020-10-10 08:28:53 +11:00
committed by Sergei Petrunia
parent c03885cd9c
commit a6f956488c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
storage/innobase/row/row0sel.cc
View File

@@ -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,9 +5242,11 @@ no_gap_lock:
buf, prebuilt, rec, offsets)) {
case CHECK_NEG:
goto next_rec;
case CHECK_OUT_OF_RANGE:
case CHECK_ABORTED_BY_USER:
case CHECK_ERROR:
err = DB_INTERRUPTED;
goto idx_cond_failed;
case CHECK_OUT_OF_RANGE:
case CHECK_ERROR:
err = DB_RECORD_NOT_FOUND;
goto idx_cond_failed;
case CHECK_POS: