mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
row0mysql.c:
Backport from 4.0: Fix corruption of ON DELETE CASCADE in lock wait timeout
This commit is contained in:
parent
5715252238
commit
be51d6ae8c
1 changed files with 21 additions and 6 deletions
|
@ -1000,8 +1000,8 @@ row_update_cascade_for_mysql(
|
|||
or set null operation */
|
||||
dict_table_t* table) /* in: table where we do the operation */
|
||||
{
|
||||
ulint err;
|
||||
trx_t* trx;
|
||||
ulint err;
|
||||
trx_t* trx;
|
||||
|
||||
trx = thr_get_trx(thr);
|
||||
run_again:
|
||||
|
@ -1012,11 +1012,26 @@ run_again:
|
|||
|
||||
err = trx->error_state;
|
||||
|
||||
if (err == DB_LOCK_WAIT) {
|
||||
que_thr_stop_for_mysql(thr);
|
||||
|
||||
row_mysql_handle_errors(&err, trx, thr, NULL);
|
||||
/* Note that the cascade node is a subnode of another InnoDB
|
||||
query graph node. We do a normal lock wait in this node, but
|
||||
all errors are handled by the parent node. */
|
||||
|
||||
if (err == DB_LOCK_WAIT) {
|
||||
/* Handle lock wait here */
|
||||
|
||||
que_thr_stop_for_mysql(thr);
|
||||
|
||||
srv_suspend_mysql_thread(thr);
|
||||
|
||||
/* Note that a lock wait may also end in a lock wait timeout */
|
||||
|
||||
if (trx->error_state != DB_SUCCESS) {
|
||||
|
||||
return(trx->error_state);
|
||||
}
|
||||
|
||||
/* Retry operation after a normal lock wait */
|
||||
|
||||
goto run_again;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue