database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql-5.1-innodb from bk-internal into my local repo

Browse Source
This commit is contained in:
Vasil Dimov
2010-11-10 10:40:22 +02:00
parent a491492f15 cf3433d7f3
commit ce782ee2c2
51 changed files with 2088 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
storage/innodb_plugin/row/row0mysql.c
View File

@ -1594,6 +1594,9 @@ row_update_cascade_for_mysql(
trx = thr_get_trx(thr);
/* Increment fk_cascade_depth to record the recursive call depth on
a single update/delete that affects multiple tables chained
together with foreign key relations. */
thr->fk_cascade_depth++;
if (thr->fk_cascade_depth > FK_MAX_CASCADE_DEL) {
@ -1605,6 +1608,12 @@ run_again:
row_upd_step(thr);
/* The recursive call for cascading update/delete happens
in above row_upd_step(), reset the counter once we come
out of the recursive call, so it does not accumulate for
different row deletes */
thr->fk_cascade_depth = 0;
err = trx->error_state;
/* Note that the cascade node is a subnode of another InnoDB