1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "MDEV-32964: Expect DB_INTERRUPTED from wsrep_row_upd_check_foreign_constraints"

Browse Source 
This reverts commit ddd8a90812e8ab7675b989696023e0a9966b6409 (additional correction required)
This commit is contained in:
Julius Goryavsky 2023-12-20 14:20:40 +01:00
parent 0e1f4bd661
commit 96e49c76a8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/innobase/row/row0upd.cc
View File

@ -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_INTERRUPTED: case DB_LOCK_WAIT:
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->table->name.m_name, index->name(), ut_strerr(err), index->name(), index->table->name.m_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->table->name.m_name, index->name(), ut_strerr(err), index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd)); wsrep_thd_query(trx->mysql_thd));
break; break;
} }
@ -2506,7 +2506,7 @@ row_upd_sec_index_entry(
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
ut_ad(err == DB_SUCCESS || err == DB_INTERRUPTED ut_ad(err == DB_SUCCESS || err == DB_LOCK_WAIT
|| 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);