summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/t
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-09-15 08:49:55 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-09-15 08:49:55 -0400
commit31cf362c21b24ebda9d3997a401750ec94a19d5c (patch)
tree632311b39901fd8584c0d71ebb90bd04047b5ae5 /mysql-test/suite/rpl/t
parent6cc1befcf26b2dc43e5cd7ad85d29c576073b1c5 (diff)
downloadmariadb-git-31cf362c21b24ebda9d3997a401750ec94a19d5c.tar.gz
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.
Diffstat (limited to 'mysql-test/suite/rpl/t')
-rw-r--r--mysql-test/suite/rpl/t/rpl_domain_id_filter.test8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_domain_id_filter.test b/mysql-test/suite/rpl/t/rpl_domain_id_filter.test
index 01de2766b37..1503ee1adaa 100644
--- a/mysql-test/suite/rpl/t/rpl_domain_id_filter.test
+++ b/mysql-test/suite/rpl/t/rpl_domain_id_filter.test
@@ -228,11 +228,11 @@ SET @@session.gtid_domain_id=1;
BEGIN;
INSERT INTO t2 VALUES(3);
INSERT INTO t3 VALUES(3);
-save_master_pos;
+--source include/save_master_gtid.inc
--echo # On slave
connection slave;
-sync_with_master;
+--source include/sync_with_master_gtid.inc
--source include/stop_slave.inc
let $do_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
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;
BEGIN;
INSERT INTO t2 VALUES(5);
INSERT INTO t3 VALUES(5);
-save_master_pos;
+--source include/save_master_gtid.inc
--echo # On slave
connection slave;
-sync_with_master;
+--source include/sync_with_master_gtid.inc
--source include/stop_slave.inc
let $do_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);