Skip to content

Commit 58fad04

Browse files
author
Daniele Sciascia
committed
MDEV-13549 Fix and re-enable MTR test galera.galera_as_master
Was failing due to missing RESET MASTER
1 parent 2f2e7f8 commit 58fad04

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

mysql-test/suite/galera/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ lp1376747 : MDEV-13549 Galera test failures
4141
galera_toi_ddl_nonconflicting : MDEV-13549 Galera test failures
4242
galera_parallel_simple : MDEV-13549 Galera test failures
4343
galera_admin : MDEV-13549 Galera test failures
44-
galera_as_master: MDEV-13549 Galera test failures 10.1
4544
galera_pc_ignore_sb : MDEV-13549 Galera test failures 10.1
4645
galera_lock_table : MDEV-13549 Galera test failures 10.1
4746
MW-284 : MDEV-13549 Galera test failures 10.1

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ DROP TABLE t2, t3;
4747
STOP SLAVE;
4848
RESET SLAVE ALL;
4949
CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work');
50+
RESET MASTER;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ SELECT * FROM t3;
3535
SELECT * FROM t4;
3636

3737
--connection node_3
38-
SHOW TABLES;
39-
4038
--let $wait_condition = SELECT COUNT(*) = 2 FROM t1;
4139
--source include/wait_condition.inc
4240

4341
--let $wait_condition = SELECT COUNT(*) = 3 FROM t4;
4442
--source include/wait_condition.inc
4543

44+
SHOW TABLES;
45+
4646
SELECT * FROM t1;
4747
SELECT * FROM t4;
4848

@@ -63,3 +63,5 @@ RESET SLAVE ALL;
6363

6464
CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work');
6565

66+
--connection node_1
67+
RESET MASTER;

0 commit comments

Comments
 (0)