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

manual merge of 28141

Browse Source
This commit is contained in:
Tatiana A. Nurnberg
2009-10-20 11:00:07 -07:00
parent ead175bb07 5ef63a4f1c
commit 3f0d0d0633
7 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/extra/rpl_tests/rpl_stm_000001.test
View File

@ -93,7 +93,7 @@ kill @id;
# We don't drop t3 as this is a temporary table
drop table t2;
connection master;
--error 1053,2013
--error 1317,2013
reap;
connection slave;
# The SQL slave thread should now have stopped because the query was killed on

2
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
View File

@ -50,7 +50,7 @@ kill @id;
drop table t2,t3;
insert into t4 values (3),(4);
connection master;
--error 0,1053,2013
--error 0,1317,2013
reap;
connection master1;
save_master_pos;

2
mysql-test/t/flush_read_lock_kill.test
View File

@ -57,7 +57,7 @@ connection con1;
# debug build running without our --debug=make_global..., will be
# error 0 (no error). The only important thing to test is that on
# debug builds with our --debug=make_global... we don't hang forever.
--error 0,1053,2013
--error 0,1317,2013
reap;
connection con2;

2
mysql-test/t/kill.test
View File

@ -97,7 +97,7 @@ select ((@id := kill_id) - kill_id) from t3;
kill @id;
connection conn1;
-- error 1053,2013
-- error 1317,2013
reap;
connection default;