From 40d0b6416729cec49d7cf1ae4dfa5ec59c455812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Fri, 8 May 2020 09:13:47 +0300 Subject: [PATCH] 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. --- .../suite/galera/r/galera_as_slave_gtid_myisam.result | 3 +++ .../suite/galera/t/galera_as_slave_gtid_myisam.test | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result b/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result index d8a9f0d6f57..bea76e19dbb 100644 --- a/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result +++ b/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result @@ -23,6 +23,9 @@ gtid_binlog_state_equal #cleanup connection node_1; DROP TABLE t1; +connection node_2; +connection node_3; +connection node_1; reset master; connection node_2; STOP SLAVE; diff --git a/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test b/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test index 33668da11be..3710e6d65be 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test +++ b/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test @@ -55,6 +55,16 @@ SELECT COUNT(*) = 0 FROM t1; --echo #cleanup --connection node_1 DROP TABLE t1; + +--connection node_2 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc + +--connection node_3 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc + +--connection node_1 reset master; --connection node_2