Skip to content

Commit a878344

Browse files
author
Jan Lindström
committed
MDEV-21421 : Galera test sporadic failure on galera.galera_as_slave_gtid_myisam: Result length mismatch
Add wait_condition so that drop table has time to replicate to Galera cluster.
1 parent 057a700 commit a878344

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ gtid_binlog_state_equal
2828
#cleanup
2929
connection node_3;
3030
DROP TABLE t1;
31-
reset master;
31+
connection node_1;
32+
connection node_2;
33+
connection node_3;
34+
RESET MASTER;
3235
connection node_1;
3336
STOP SLAVE;
3437
RESET SLAVE ALL;

mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,17 @@ SELECT COUNT(*) AS EXPECT_0 FROM t1;
5858
--echo #cleanup
5959
--connection node_3
6060
DROP TABLE t1;
61-
reset master;
61+
62+
--connection node_1
63+
--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
64+
--source include/wait_condition.inc
65+
66+
--connection node_2
67+
--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
68+
--source include/wait_condition.inc
69+
70+
--connection node_3
71+
RESET MASTER;
6272

6373
--connection node_1
6474
STOP SLAVE;

0 commit comments

Comments
 (0)