diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-04-08 19:55:55 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-04-08 19:55:55 +0300 |
| commit | 6e24349e985a62b8c908bae8928270a094e0fdf1 (patch) | |
| tree | 829867c888f4c33c3403a1ed84dd30f7e08fcd4a /mysql-test | |
| parent | 9e451f11a134a107f08a159d246fdca1e23371cc (diff) | |
| download | mariadb-git-6e24349e985a62b8c908bae8928270a094e0fdf1.tar.gz | |
Adjust mysql-test/suite/binlog/t/binlog_killed.test after a change
in behavior in InnoDB. The change in behavior was introduced by this
changeset:
------------------------------------------------------------
revno: 3370
revision-id: vasil.dimov@oracle.com-20100331130613-8ja7n0vh36a80457
parent: vasil.dimov@oracle.com-20100331130440-l0y517y3mjsjqy4v
parent: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c
committer: Vasil Dimov <vasil.dimov@oracle.com>
branch nick: mysql-5.1-innodb
timestamp: Wed 2010-03-31 16:06:13 +0300
message:
Merge from innodb-branches-5.1
------------------------------------------------------------
revno: 0.1.819
revision-id: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c
parent: vasil.dimov@oracle.com-20100331064722-9rc3wypzmer7d6jj
parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918
committer: Vasil Dimov <vasil.dimov@oracle.com>
branch nick: innodb-branches-5.1
timestamp: Wed 2010-03-31 14:31:19 +0300
message:
Merge from SVN
------------------------------------------------------------
revno: 0.2.1
revision-id: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918
parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6912
committer: mmakela
timestamp: Wed 2010-03-31 07:14:51 +0000
message:
branches/5.1: Obey KILL during a lock wait (Bug #51920).
srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread():
Check trx_is_interrupted() in addition to checking the lock wait timeout.
rb://279 approved by Sunny Bains
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_killed.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test index e2db326129d..ce6d344af32 100644 --- a/mysql-test/suite/binlog/t/binlog_killed.test +++ b/mysql-test/suite/binlog/t/binlog_killed.test @@ -202,7 +202,7 @@ eval kill query $ID; rollback; connection con2; ---error 0,ER_QUERY_INTERRUPTED +--error 0,ER_QUERY_INTERRUPTED,ER_LOCK_WAIT_TIMEOUT reap; # todo 1,2 above rollback; |