Commit 0233a793 authored by evgen@moonbone.local's avatar evgen@moonbone.local
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql
parents daa5c203 86c3d95c

sql/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -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);