Skip to content

Commit 31cf362

Browse files
author
Nirbhay Choubey
committed
MDEV-7873: rpl.rpl_domain_id_filter fails sporadically in buildbot #2
Fix the test case : switch to save_master_gtid.inc & sync_with_master_gtid.inc to sync slave with master.
1 parent 6cc1bef commit 31cf362

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

mysql-test/suite/rpl/r/rpl_domain_id_filter.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ SET @@session.gtid_domain_id=1;
153153
BEGIN;
154154
INSERT INTO t2 VALUES(3);
155155
INSERT INTO t3 VALUES(3);
156+
include/save_master_gtid.inc
156157
# On slave
158+
include/sync_with_master_gtid.inc
157159
include/stop_slave.inc
158160
DO_DOMAIN_IDS (BEFORE) :
159161
IGNORE_DOMAIN_IDS (BEFORE) : 1
@@ -180,7 +182,9 @@ SET @@session.gtid_domain_id=1;
180182
BEGIN;
181183
INSERT INTO t2 VALUES(5);
182184
INSERT INTO t3 VALUES(5);
185+
include/save_master_gtid.inc
183186
# On slave
187+
include/sync_with_master_gtid.inc
184188
include/stop_slave.inc
185189
DO_DOMAIN_IDS (BEFORE) :
186190
IGNORE_DOMAIN_IDS (BEFORE) :

mysql-test/suite/rpl/t/rpl_domain_id_filter.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,11 @@ SET @@session.gtid_domain_id=1;
228228
BEGIN;
229229
INSERT INTO t2 VALUES(3);
230230
INSERT INTO t3 VALUES(3);
231-
save_master_pos;
231+
--source include/save_master_gtid.inc
232232

233233
--echo # On slave
234234
connection slave;
235-
sync_with_master;
235+
--source include/sync_with_master_gtid.inc
236236
--source include/stop_slave.inc
237237
let $do_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
238238
let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -270,11 +270,11 @@ SET @@session.gtid_domain_id=1;
270270
BEGIN;
271271
INSERT INTO t2 VALUES(5);
272272
INSERT INTO t3 VALUES(5);
273-
save_master_pos;
273+
--source include/save_master_gtid.inc
274274

275275
--echo # On slave
276276
connection slave;
277-
sync_with_master;
277+
--source include/sync_with_master_gtid.inc
278278
--source include/stop_slave.inc
279279
let $do_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
280280
let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);

0 commit comments

Comments
 (0)