mariadb/storage
Vasil Dimov 2d299d84f9 Followup to Bug#51920, fix binlog.binlog_killed
This is a followup to the fix of

Bug#51920 Innodb connections in row lock wait ignore KILL until lock wait
timeout

in that fix (rb://279) the behavior was changed to honor when a trx is
interrupted during lock wait, but the returned error code was still
"lock wait timeout" when it should be "interrupted".

This change fixes the non-deterministically failing test binlog.binlog_killed,
that failed like this:

binlog.binlog_killed 'stmt'              [ fail ]
        Test ended at 2010-05-12 11:39:08

CURRENT_TEST: binlog.binlog_killed
mysqltest: At line 208: query 'reap' failed with wrong errno 1205: 'Lock wait timeout exceeded; try restarting transaction', instead of 0...

Approved by:	Sunny Bains (rb://344)
2010-05-13 10:46:52 +03:00
..
archive only This is a backport of the patch for 47739 into trunk. 2010-04-26 21:39:24 +02:00
blackhole backport of patch for blckhole plugin (47748) to trunk-bugfixing. 2010-04-26 20:44:10 +02:00
csv WL#5030: Split and remove mysql_priv.h 2010-04-01 14:19:08 +02:00
example backport of cset for 47146 to trunk. 2010-04-26 18:23:20 +02:00
federated Patch for 47759 to trunk-bugfixing. 2010-05-05 09:35:38 +02:00
heap WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
ibmdb2i merge 2009-12-22 22:24:55 +01:00
innobase Followup to Bug#51920, fix binlog.binlog_killed 2010-05-13 10:46:52 +03:00
myisam merge from mysql-trunk-bugfixing 2010-04-20 10:51:50 +02:00
myisammrg WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
ndb Manual merge of mysql-trunk into mysql-trunk-merge. 2010-03-24 18:03:44 +03:00
perfschema Fix perfschema unittests build on Windows 2010-04-13 13:48:46 +02:00
Makefile.am WL#5161 : Cross-platform build with CMake 2009-11-09 12:32:48 +01:00