Skip to content

Commit 77eb22f

Browse files
author
Jan Lindström
committed
MDEV-21517 : Galera test galera_sr.GCF-561 failure: Result length mismatch
Add wait conditions.
1 parent 6cc819b commit 77eb22f

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

mysql-test/suite/galera_sr/r/GCF-561.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ INSERT INTO t1 VALUES (4, 4);
1212
INSERT INTO t1 VALUES (5, 5);
1313
connection node_2;
1414
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
15-
SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
16-
COUNT(*) > 0
17-
1
15+
SELECT COUNT(*) AS EXPECT_5 FROM mysql.wsrep_streaming_log;
16+
EXPECT_5
17+
5
1818
ALTER TABLE t1 DROP COLUMN f2;
1919
SELECT COUNT(*) AS EXPECT_0 FROM t1;
2020
EXPECT_0

mysql-test/suite/galera_sr/t/GCF-561.test

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ INSERT INTO t1 VALUES (5, 5);
2020

2121
--connection node_2
2222
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
23-
--let $wait_condition = SELECT COUNT(*) > 0 FROM t1;
23+
--let $wait_condition = SELECT COUNT(*) = 5 FROM t1;
24+
--source include/wait_condition.inc
25+
26+
--let $wait_condition = SELECT COUNT(*) = 5 FROM mysql.wsrep_streaming_log;
2427
--source include/wait_condition.inc
25-
SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
28+
SELECT COUNT(*) AS EXPECT_5 FROM mysql.wsrep_streaming_log;
2629

2730
ALTER TABLE t1 DROP COLUMN f2;
2831

@@ -35,6 +38,8 @@ SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
3538
--error ER_LOCK_DEADLOCK
3639
INSERT INTO t1 VALUES (6, 6);
3740

41+
--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
42+
--source include/wait_condition.inc
3843
SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
3944

4045
# DDL is now in effect

0 commit comments

Comments
 (0)