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

MDEV-7236: rpl.rpl_gtid_basic failed in buildbot with wait_condition timeout

Fix rare failures in test case rpl.rpl_gtid_basic:

 - Add another possible error code when a connection is killed.

 - Make sure that the IO thread has had time to complete its stop after START
   SLAVE UNTIL. Otherwise, START SLAVE might run before IO thread stop,
   leaving the test case with a stopped IO thread that eventually causes a
   wait timeout.
This commit is contained in:
Kristian Nielsen
2014-12-02 12:10:21 +01:00
parent 50b42441a6
commit 0450623f73
2 changed files with 4 additions and 4 deletions

View File

@ -334,7 +334,7 @@ reap;
eval KILL CONNECTION $kill2_id;
--connection s6
--error 2013
--error 2013,ER_CONNECTION_KILLED
reap;
--connection server_1
@ -456,7 +456,7 @@ SET sql_slave_skip_counter=1;
START SLAVE UNTIL master_gtid_pos="3-1-100";
--let $master_pos=3-1-100
--source include/sync_with_master_gtid.inc
--source include/wait_for_slave_sql_to_stop.inc
--source include/wait_for_slave_to_stop.inc
--error ER_NO_SUCH_TABLE
SELECT * FROM t2;
SELECT IF(LOCATE("3-1-100", @@GLOBAL.gtid_slave_pos)>0, "Ok", CONCAT("ERROR! expected GTID 3-1-100 not found in gtid_slave_pos: ", @@GLOBAL.gtid_slave_pos)) AS status;