database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge mysql-5.1 -> mysql-5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov
2010-06-01 14:44:31 +03:00
parent 4d01771807 dc8c8174b4
commit 1c2c5529c3
93 changed files with 1422 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/t/binlog_killed.test
View File

@ -202,7 +202,7 @@ eval kill query $ID;
rollback;
connection con2;
--error 0,ER_QUERY_INTERRUPTED,ER_LOCK_WAIT_TIMEOUT
--error 0,ER_QUERY_INTERRUPTED
reap;
# todo 1,2 above
rollback;