MDEV-21517 : Galera test galera_sr.GCF-561 failure: Result length mis…

…match Add wait conditions.
MariaDB · Feb 16, 2020 · 7002948 · 7002948
1 parent a3f3d40
commit 7002948
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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