Commit 3f97b7b6 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org

Merge sinisa@work.mysql.com:/home/bk/mysql

into sinisa.nasamreza.org:/mnt/work/mysql
parents 0ea250e4 be51d6ae
...@@ -1012,10 +1012,25 @@ row_update_cascade_for_mysql( ...@@ -1012,10 +1012,25 @@ row_update_cascade_for_mysql(
err = trx->error_state; err = trx->error_state;
/* 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) { if (err == DB_LOCK_WAIT) {
/* Handle lock wait here */
que_thr_stop_for_mysql(thr); que_thr_stop_for_mysql(thr);
row_mysql_handle_errors(&err, trx, thr, NULL); 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; goto run_again;
} }
......
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