Skip to content

Commit

Permalink
MDEV-32964: Expect DB_INTERRUPTED from wsrep_row_upd_check_foreign_co…
Browse files Browse the repository at this point in the history
…nstraints

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: Julius Goryavsky <julius.goryavsky@mariadb.com>
  • Loading branch information
denis-protivensky authored and sysprg committed Dec 20, 2023
1 parent 148cbf2 commit ddd8a90
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions storage/innobase/row/row0upd.cc
Expand Up @@ -2486,18 +2486,18 @@ row_upd_sec_index_entry(
case DB_NO_REFERENCED_ROW:
err = DB_SUCCESS;
break;
case DB_LOCK_WAIT:
case DB_INTERRUPTED:
case DB_DEADLOCK:
case DB_LOCK_WAIT_TIMEOUT:
WSREP_DEBUG("Foreign key check fail: "
"%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));
break;
default:
WSREP_ERROR("Foreign key check fail: "
"%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));
break;
}
Expand All @@ -2506,7 +2506,7 @@ row_upd_sec_index_entry(
}

#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);
#else
ut_ad(err == DB_SUCCESS);
Expand Down

0 comments on commit ddd8a90

Please sign in to comment.