From 31cf362c21b24ebda9d3997a401750ec94a19d5c Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Tue, 15 Sep 2015 08:49:55 -0400
Subject: [PATCH] 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.
---
 mysql-test/suite/rpl/r/rpl_domain_id_filter.result | 4 ++++
 mysql-test/suite/rpl/t/rpl_domain_id_filter.test   | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mysql-test/suite/rpl/r/rpl_domain_id_filter.result b/mysql-test/suite/rpl/r/rpl_domain_id_filter.result
index 7fcbe236914..fb315c4b020 100644
--- a/mysql-test/suite/rpl/r/rpl_domain_id_filter.result
+++ b/mysql-test/suite/rpl/r/rpl_domain_id_filter.result
@@ -153,7 +153,9 @@ SET @@session.gtid_domain_id=1;
 BEGIN;
 INSERT INTO t2 VALUES(3);
 INSERT INTO t3 VALUES(3);
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 include/stop_slave.inc
 DO_DOMAIN_IDS (BEFORE)     : 
 IGNORE_DOMAIN_IDS (BEFORE) : 1
@@ -180,7 +182,9 @@ SET @@session.gtid_domain_id=1;
 BEGIN;
 INSERT INTO t2 VALUES(5);
 INSERT INTO t3 VALUES(5);
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 include/stop_slave.inc
 DO_DOMAIN_IDS (BEFORE)     : 
 IGNORE_DOMAIN_IDS (BEFORE) : 
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);