mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/innobase
History
Vasil Dimov c88f2f61ac 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
..
btr Merge from mysql-5.1-innodb: 2010-05-11 18:42:44 +03:00
buf Merge from mysql-5.1-innodb: 2010-05-11 18:46:17 +03:00
data Merge r3403..3414 from mysql-5.1-innodb: 2010-04-22 14:24:42 +03:00
dict Followup to vasil.dimov@oracle.com-20100504104629-0ovtc5lae2ghn7he : 2010-05-04 14:47:35 +03:00
dyn Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
eval Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
fil Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
fsp Merge from mysql-5.1-innodb: 2010-05-04 16:57:09 +03:00
fut Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
ha Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
handler Check in patch for bug #53336, Improved InnoDB Transaction Reporting. 2010-05-12 08:39:45 -07:00
ibuf Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
include Check in patch for bug #53336, Improved InnoDB Transaction Reporting. 2010-05-12 08:39:45 -07:00
lock Check in patch for bug #53336, Improved InnoDB Transaction Reporting. 2010-05-12 08:39:45 -07:00
log Fix bug#53499 - purge thread is active during shutdown, assert buf/buf0buf.c line 4115. 2010-05-10 13:17:17 +10:00
mach Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
mem Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
mtr Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
mysql-test/patches Move InnoDB tests from storage/innobase/mysql-test/ (where they were ignored) 2010-04-14 14:14:48 +03:00
os Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
page Merge from mysql-5.1-innodb: 2010-05-11 18:39:19 +03:00
pars Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
que Remove references to srv0que.h. 2010-05-12 12:20:26 +10:00
read Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
rem Merge from mysql-5.1-innodb: 2010-05-11 19:18:28 +03:00
row Followup to Bug#51920, fix binlog.binlog_killed 2010-05-13 10:46:52 +03:00
srv Followup to Bug#51920, fix binlog.binlog_killed 2010-05-13 10:46:52 +03:00
sync Revert the kernel mutex split phase I patch. Some artefacts have been left 2010-05-12 11:18:10 +10:00
thr Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
trx Fix whitespace breakage introduced in 2010-05-12 20:37:00 +03:00
usr Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mysql-trunk-merge. 2009-12-02 19:30:50 +05:30
ut Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
CMakeLists.txt Clean up CMake file by removing duplicate entry for Windows. 2010-05-07 15:37:34 -05:00
compile-innodb Update compile-innodb to use cmake and remove the debug version. 2010-04-15 12:33:07 +03:00
COPYING Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Google Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Percona Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Sun_Microsystems Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
Doxyfile Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
ha_innodb.def Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
Makefile.am Merge from innodb-branches-innodb+ 2010-04-22 12:00:59 +03:00
plug.in Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00