Commit ddd8a908 authored by Denis Protivensky's avatar Denis Protivensky Committed by Julius Goryavsky

MDEV-32964: Expect DB_INTERRUPTED from wsrep_row_upd_check_foreign_constraints

Remove DB_LOCK_WAIT return code check as it should have been resolved to
one of the other errors by that point.
Signed-off-by: default avatarJulius Goryavsky <julius.goryavsky@mariadb.com>
parent 148cbf2a
...@@ -2486,18 +2486,18 @@ row_upd_sec_index_entry( ...@@ -2486,18 +2486,18 @@ row_upd_sec_index_entry(
case DB_NO_REFERENCED_ROW: case DB_NO_REFERENCED_ROW:
err = DB_SUCCESS; err = DB_SUCCESS;
break; break;
case DB_LOCK_WAIT: case DB_INTERRUPTED:
case DB_DEADLOCK: case DB_DEADLOCK:
case DB_LOCK_WAIT_TIMEOUT: case DB_LOCK_WAIT_TIMEOUT:
WSREP_DEBUG("Foreign key check fail: " WSREP_DEBUG("Foreign key check fail: "
"%s on table %s index %s query %s", "%s on table %s index %s query %s",
ut_strerr(err), index->name(), index->table->name.m_name, ut_strerr(err), index->table->name.m_name, index->name(),
wsrep_thd_query(trx->mysql_thd)); wsrep_thd_query(trx->mysql_thd));
break; break;
default: default:
WSREP_ERROR("Foreign key check fail: " WSREP_ERROR("Foreign key check fail: "
"%s on table %s index %s query %s", "%s on table %s index %s query %s",
ut_strerr(err), index->name(), index->table->name.m_name, ut_strerr(err), index->table->name.m_name, index->name(),
wsrep_thd_query(trx->mysql_thd)); wsrep_thd_query(trx->mysql_thd));
break; break;
} }
...@@ -2506,7 +2506,7 @@ row_upd_sec_index_entry( ...@@ -2506,7 +2506,7 @@ row_upd_sec_index_entry(
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
ut_ad(err == DB_SUCCESS || err == DB_LOCK_WAIT ut_ad(err == DB_SUCCESS || err == DB_INTERRUPTED
|| err == DB_DEADLOCK || err == DB_LOCK_WAIT_TIMEOUT); || err == DB_DEADLOCK || err == DB_LOCK_WAIT_TIMEOUT);
#else #else
ut_ad(err == DB_SUCCESS); ut_ad(err == DB_SUCCESS);
......
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