Skip to content

Commit 7604734

Browse files
committed
MDEV-39561 : Galera test failure on mysql-wsrep-features#8
Test case changes only. Fix wait_conditions.
1 parent ed8f61d commit 7604734

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

mysql-test/suite/galera_sr/t/mysql-wsrep-features#8.test

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CREATE TABLE t1 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 VARCHAR(100), FULLTEXT (f
1818

1919
--connection node_2
2020
--let $wait_condition = SELECT COUNT(*) = 13 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE name LIKE 'test/%'
21-
--let $wait_condition_on_error_output =
2221
--source include/wait_condition.inc
2322

2423
SELECT COUNT(*) AS EXPECT_13 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE name LIKE 'test/%';
@@ -33,15 +32,17 @@ INSERT INTO t1 (f2) SELECT 'foobarbaz' FROM ten AS a1, ten AS a2, ten AS a3, ten
3332

3433
--connection node_2
3534
--let $wait_condition = SELECT COUNT(*) = 10000 FROM t1 WHERE MATCH(f2) AGAINST ('foobarbaz')
36-
--source include/wait_condition.inc
35+
--let $wait_condition_on_error_output = SELECT COUNT(*) FROM t1
36+
--source include/wait_condition_with_debug.inc
3737

3838
SELECT COUNT(f2) AS EXPECT_10000 FROM t1 WHERE MATCH(f2) AGAINST ('foobarbaz');
3939

4040
UPDATE t1 SET f2 = 'abcdefjhk';
4141

4242
--connection node_1
4343
--let $wait_condition = SELECT COUNT(*) = 10000 FROM t1 WHERE MATCH(f2) AGAINST ('abcdefjhk')
44-
--source include/wait_condition.inc
44+
--let $wait_condition_on_error_output = SELECT COUNT(*) FROM t1
45+
--source include/wait_condition_with_debug.inc
4546

4647
SELECT COUNT(f2) AS EXPECT_10000 FROM t1 WHERE MATCH(f2) AGAINST ('abcdefjhk');
4748

@@ -68,16 +69,19 @@ INSERT INTO t1 (f1) SELECT 'foobarbaz' FROM ten AS a1, ten AS a2, ten AS a3;
6869

6970
--connection node_1
7071
--let $wait_condition = SELECT COUNT(*) = 1000 FROM t1 WHERE MATCH(f1) AGAINST ('foobarbaz')
71-
--source include/wait_condition.inc
72+
--let $wait_condition_on_error_output = SELECT * FROM t1
73+
--source include/wait_condition_with_debug.inc
7274

7375
SELECT COUNT(f1) AS EXPECT_1000 FROM t1 WHERE MATCH(f1) AGAINST ('foobarbaz');
7476

7577
UPDATE t1 SET f1 = 'abcdefjhk';
78+
7679
SELECT COUNT(f1) AS EXPECT_1000 FROM t1 WHERE MATCH(f1) AGAINST ('abcdefjhk');
7780

7881
--connection node_2
7982
--let $wait_condition = SELECT COUNT(*) = 1000 FROM t1 WHERE MATCH(f1) AGAINST ('abcdefjhk')
80-
--source include/wait_condition.inc
83+
--let $wait_condition_on_error_output = SELECT * FROM t1
84+
--source include/wait_condition_with_debug.inc
8185

8286
SELECT COUNT(f1) AS EXPECT_1000 FROM t1 WHERE MATCH(f1) AGAINST ('abcdefjhk');
8387

0 commit comments

Comments
 (0)