diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-02-12 11:29:37 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-02-21 08:25:51 +0200 |
| commit | 77eb22fd5896963222035f846b3ae0d51b29f41e (patch) | |
| tree | 92b16e290937c09b773c545dc97b7851b0ac2256 | |
| parent | 6cc819b413a45edd5ae73fc8e6a906d81734b1da (diff) | |
| download | mariadb-git-77eb22fd5896963222035f846b3ae0d51b29f41e.tar.gz | |
MDEV-21517 : Galera test galera_sr.GCF-561 failure: Result length mismatch
Add wait conditions.
| -rw-r--r-- | mysql-test/suite/galera_sr/r/GCF-561.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/galera_sr/t/GCF-561.test | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/mysql-test/suite/galera_sr/r/GCF-561.result b/mysql-test/suite/galera_sr/r/GCF-561.result index 9d595973f57..ec5ec786628 100644 --- a/mysql-test/suite/galera_sr/r/GCF-561.result +++ b/mysql-test/suite/galera_sr/r/GCF-561.result @@ -12,9 +12,9 @@ INSERT INTO t1 VALUES (4, 4); INSERT INTO t1 VALUES (5, 5); connection node_2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log; -COUNT(*) > 0 -1 +SELECT COUNT(*) AS EXPECT_5 FROM mysql.wsrep_streaming_log; +EXPECT_5 +5 ALTER TABLE t1 DROP COLUMN f2; SELECT COUNT(*) AS EXPECT_0 FROM t1; EXPECT_0 diff --git a/mysql-test/suite/galera_sr/t/GCF-561.test b/mysql-test/suite/galera_sr/t/GCF-561.test index b58e337e72c..eadf0263ada 100644 --- a/mysql-test/suite/galera_sr/t/GCF-561.test +++ b/mysql-test/suite/galera_sr/t/GCF-561.test @@ -20,9 +20,12 @@ INSERT INTO t1 VALUES (5, 5); --connection node_2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; ---let $wait_condition = SELECT COUNT(*) > 0 FROM t1; +--let $wait_condition = SELECT COUNT(*) = 5 FROM t1; +--source include/wait_condition.inc + +--let $wait_condition = SELECT COUNT(*) = 5 FROM mysql.wsrep_streaming_log; --source include/wait_condition.inc -SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log; +SELECT COUNT(*) AS EXPECT_5 FROM mysql.wsrep_streaming_log; ALTER TABLE t1 DROP COLUMN f2; @@ -35,6 +38,8 @@ SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log; --error ER_LOCK_DEADLOCK INSERT INTO t1 VALUES (6, 6); +--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; +--source include/wait_condition.inc SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log; # DDL is now in effect |