mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merged in change sets 3772-3779 from lp:codership-mysql/5.5

Browse source
This commit is contained in:
Seppo Jaakola 2012-08-30 12:22:37 +03:00
commit 8e84b9e740
15 changed files with 183 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

30
storage/innobase/row/row0ins.c
View file

@ -1423,22 +1423,12 @@ run_again:
if (check_ref) {
err = DB_SUCCESS;
#ifdef WITH_WSREP
if (thr->fk_cascade_depth == 0) {
err = wsrep_append_foreign_key(
thr_get_trx(thr),
foreign,
rec,
check_index,
check_ref, TRUE);
} else {
fprintf(stderr, "WSREP: skipping FK key append\n");
err = wsrep_append_foreign_key(
thr_get_trx(thr),
foreign,
rec,
check_index,
TRUE, TRUE);
}
err = wsrep_append_foreign_key(
thr_get_trx(thr),
foreign,
rec,
check_index,
check_ref, TRUE);
#endif /* WITH_WSREP */
goto end_scan;
} else if (foreign->type != 0) {
@ -1469,14 +1459,6 @@ run_again:
goto end_scan;
}
#ifdef WITH_WSREP_REMOVED
err = wsrep_append_foreign_key(
thr_get_trx(thr),
foreign,
rec,
check_index,
FALSE);
#endif /* WITH_WSREP */
/* row_ins_foreign_check_on_constraint
may have repositioned pcur on a
different block */