Commit a6f95648 authored by Daniel Black's avatar Daniel Black Committed by Sergei Petrunia

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.
parent c03885cd
......@@ -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 @@ row_search_mvcc(
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:
......
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