1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-7873: rpl.rpl_domain_id_filter fails sporadically in buildbot #2

Browse Source 
Fix the test case : switch to save_master_gtid.inc &
sync_with_master_gtid.inc to sync slave with master.
This commit is contained in:
Nirbhay Choubey 2015-09-15 08:49:55 -04:00
parent 6cc1befcf2
commit 31cf362c21
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/r/rpl_domain_id_filter.result
View File

@ -153,7 +153,9 @@ SET @@session.gtid_domain_id=1;
BEGIN; BEGIN;
INSERT INTO t2 VALUES(3); INSERT INTO t2 VALUES(3);
INSERT INTO t3 VALUES(3); INSERT INTO t3 VALUES(3);
include/save_master_gtid.inc
# On slave # On slave
include/sync_with_master_gtid.inc
include/stop_slave.inc include/stop_slave.inc
DO_DOMAIN_IDS (BEFORE) : DO_DOMAIN_IDS (BEFORE) :
IGNORE_DOMAIN_IDS (BEFORE) : 1 IGNORE_DOMAIN_IDS (BEFORE) : 1
@ -180,7 +182,9 @@ SET @@session.gtid_domain_id=1;
BEGIN; BEGIN;
INSERT INTO t2 VALUES(5); INSERT INTO t2 VALUES(5);
INSERT INTO t3 VALUES(5); INSERT INTO t3 VALUES(5);
include/save_master_gtid.inc
# On slave # On slave
include/sync_with_master_gtid.inc
include/stop_slave.inc include/stop_slave.inc
DO_DOMAIN_IDS (BEFORE) : DO_DOMAIN_IDS (BEFORE) :
IGNORE_DOMAIN_IDS (BEFORE) : IGNORE_DOMAIN_IDS (BEFORE) :

8
mysql-test/suite/rpl/t/rpl_domain_id_filter.test
View File

@ -228,11 +228,11 @@ SET @@session.gtid_domain_id=1;
BEGIN; BEGIN;
INSERT INTO t2 VALUES(3); INSERT INTO t2 VALUES(3);
INSERT INTO t3 VALUES(3); INSERT INTO t3 VALUES(3);
save_master_pos; --source include/save_master_gtid.inc
--echo # On slave --echo # On slave
connection slave; connection slave;
sync_with_master; --source include/sync_with_master_gtid.inc
--source include/stop_slave.inc --source include/stop_slave.inc
let $do_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1); 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); 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; BEGIN;
INSERT INTO t2 VALUES(5); INSERT INTO t2 VALUES(5);
INSERT INTO t3 VALUES(5); INSERT INTO t3 VALUES(5);
save_master_pos; --source include/save_master_gtid.inc
--echo # On slave --echo # On slave
connection slave; connection slave;
sync_with_master; --source include/sync_with_master_gtid.inc
--source include/stop_slave.inc --source include/stop_slave.inc
let $do_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1); 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); let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);