Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql
This commit is contained in:
commit
ed4836857e
@ -465,7 +465,8 @@ convert_error_code_to_mysql(
|
||||
latest SQL statement in a lock wait timeout. Previously, we
|
||||
rolled back the whole transaction. */
|
||||
|
||||
mark_transaction_to_rollback(thd, row_rollback_on_timeout);
|
||||
mark_transaction_to_rollback(thd,
|
||||
(bool)row_rollback_on_timeout);
|
||||
|
||||
return(HA_ERR_LOCK_WAIT_TIMEOUT);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user