Skip to content

Commit 959fc0c

Browse files
author
Jan Lindström
committed
MDEV-21591 : galera.galera_rsu_add_pk MTR failed: Result content mismatch
Add missing wait condition before we check the end database state.
1 parent 93dc3e2 commit 959fc0c

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

mysql-test/suite/galera/r/galera_rsu_add_pk.result

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ SET SESSION wsrep_OSU_method = "RSU";
99
ALTER TABLE t1 ADD PRIMARY KEY (f1);
1010
SET SESSION wsrep_OSU_method = "TOI";
1111
INSERT INTO t1 (f1) SELECT 200000 + (10000 * a1.f1) + (1000 * a2.f1) + (100 * a3.f1) + (10 * a4.f1) + a5.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
12-
SELECT COUNT(*) = 300000 FROM t1;
13-
COUNT(*) = 300000
14-
1
15-
SELECT MAX(f1) = 299999 FROM t1;
16-
MAX(f1) = 299999
17-
1
12+
SELECT COUNT(*) AS EXPECT_300000 FROM t1;
13+
EXPECT_300000
14+
300000
15+
SELECT MAX(f1) AS EXPECT_299999 FROM t1;
16+
EXPECT_299999
17+
299999
1818
connection node_1;
19-
SELECT COUNT(*) = 300000 FROM t1;
20-
COUNT(*) = 300000
21-
1
22-
SELECT MAX(f1) = 299999 FROM t1;
23-
MAX(f1) = 299999
24-
1
19+
SELECT COUNT(*) AS EXPECT_300000 FROM t1;
20+
EXPECT_300000
21+
300000
22+
SELECT MAX(f1) AS EXPECT_299999 FROM t1;
23+
EXPECT_299999
24+
299999
2525
SET SESSION wsrep_OSU_method = "RSU";
2626
ALTER TABLE t1 ADD PRIMARY KEY (f1);
2727
SET SESSION wsrep_OSU_method = "TOI";

mysql-test/suite/galera/t/galera_rsu_add_pk.test

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,20 @@ SET SESSION wsrep_OSU_method = "TOI";
2626
# Insert values after the ALTER
2727
INSERT INTO t1 (f1) SELECT 200000 + (10000 * a1.f1) + (1000 * a2.f1) + (100 * a3.f1) + (10 * a4.f1) + a5.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
2828

29+
--let $wait_condition = SELECT COUNT(*) = 300000 FROM t1;
30+
--source include/wait_condition.inc
2931

30-
SELECT COUNT(*) = 300000 FROM t1;
31-
SELECT MAX(f1) = 299999 FROM t1;
32+
SELECT COUNT(*) AS EXPECT_300000 FROM t1;
33+
SELECT MAX(f1) AS EXPECT_299999 FROM t1;
3234

3335
--connection node_1
3436
--reap
35-
SELECT COUNT(*) = 300000 FROM t1;
36-
SELECT MAX(f1) = 299999 FROM t1;
37+
38+
--let $wait_condition = SELECT COUNT(*) = 300000 FROM t1;
39+
--source include/wait_condition.inc
40+
41+
SELECT COUNT(*) AS EXPECT_300000 FROM t1;
42+
SELECT MAX(f1) AS EXPECT_299999 FROM t1;
3743

3844
SET SESSION wsrep_OSU_method = "RSU";
3945
ALTER TABLE t1 ADD PRIMARY KEY (f1);

0 commit comments

Comments
 (0)