Skip to content

M
MariaDB
Commit 3f847afe authored by Seppo Jaakola's avatar Seppo Jaakola
Browse files
Options

References: MDEV-4142 

Merged revision 3846 from lp:codership-mysql/5.5-23
parent f64a2c99
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
storage/innobase/row/row0upd.c
View file @ 3f847afe
...@@ -2276,12 +2276,12 @@ row_upd_del_mark_clust_rec( ...@@ -2276,12 +2276,12 @@ row_upd_del_mark_clust_rec(
if (err == DB_SUCCESS && referenced) { if (err == DB_SUCCESS && referenced) {
/* NOTE that the following call loses the position of pcur ! */ /* NOTE that the following call loses the position of pcur ! */
err = wsrep_row_upd_check_foreign_constraints( err = row_upd_check_references_constraints(
node, pcur, index->table, index, offsets, thr, mtr); node, pcur, index->table, index, offsets, thr, mtr);
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (err == DB_SUCCESS && !referenced) { if (err == DB_SUCCESS && !referenced) {
uint werr = row_upd_check_references_constraints( uint werr = wsrep_row_upd_check_foreign_constraints(
node, pcur, index->table, index, offsets, thr, mtr); node, pcur, index->table, index, offsets, thr, mtr);
if (wsrep_debug && werr != DB_SUCCESS) if (wsrep_debug && werr != DB_SUCCESS)
fprintf (stderr, "WSREP: FK check fail: %u", werr); fprintf (stderr, "WSREP: FK check fail: %u", werr);
......
storage/xtradb/row/row0upd.c
View file @ 3f847afe
...@@ -2302,12 +2302,12 @@ row_upd_del_mark_clust_rec( ...@@ -2302,12 +2302,12 @@ row_upd_del_mark_clust_rec(
if (err == DB_SUCCESS && referenced) { if (err == DB_SUCCESS && referenced) {
/* NOTE that the following call loses the position of pcur ! */ /* NOTE that the following call loses the position of pcur ! */
err = wsrep_row_upd_check_foreign_constraints( err = row_upd_check_references_constraints(
node, pcur, index->table, index, offsets, thr, mtr); node, pcur, index->table, index, offsets, thr, mtr);
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (err == DB_SUCCESS && !referenced) { if (err == DB_SUCCESS && !referenced) {
uint werr = row_upd_check_references_constraints( uint werr = wsrep_row_upd_check_foreign_constraints(
node, pcur, index->table, index, offsets, thr, mtr); node, pcur, index->table, index, offsets, thr, mtr);
if (wsrep_debug && werr != DB_SUCCESS) if (wsrep_debug && werr != DB_SUCCESS)
fprintf (stderr, "WSREP: FK check fail: %u", werr); fprintf (stderr, "WSREP: FK check fail: %u", werr);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7