From 4a976545e518e70d5124e356a057c8d9624038a3 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 9 Feb 2014 11:15:45 +0100 Subject: [PATCH] MDEV-4726: Race in mysql-test/suite/rpl/t/rpl_gtid_stop_start.test Fix a race in test case rpl_gtid_basic. include/sync_with_master_gtid.inc got confused due to two different GTIDs both with the same seq_no=9. --- mysql-test/suite/rpl/r/rpl_gtid_basic.result | 2 -- mysql-test/suite/rpl/t/rpl_gtid_basic.test | 2 -- 2 files changed, 4 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_gtid_basic.result b/mysql-test/suite/rpl/r/rpl_gtid_basic.result index 1d6f8d46d6f..858042b55e3 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_basic.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_basic.result @@ -99,10 +99,8 @@ a b 5 j1a *** Now move C to D, after letting it fall a little behind *** include/stop_slave.inc -BEGIN; INSERT INTO t2 VALUES (6, "i6b"); INSERT INTO t2 VALUES (7, "i7b"); -COMMIT; include/save_master_gtid.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4, MASTER_USE_GTID=CURRENT_POS; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_basic.test b/mysql-test/suite/rpl/t/rpl_gtid_basic.test index f88fbecf48d..f78eca44157 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_basic.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_basic.test @@ -97,10 +97,8 @@ connection server_3; --source include/stop_slave.inc connection server_1; -BEGIN; INSERT INTO t2 VALUES (6, "i6b"); INSERT INTO t2 VALUES (7, "i7b"); -COMMIT; --source include/save_master_gtid.inc connection server_3;