summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2014-02-09 11:15:45 +0100
committerunknown <knielsen@knielsen-hq.org>2014-02-09 11:15:45 +0100
commit4a976545e518e70d5124e356a057c8d9624038a3 (patch)
treefaf048d06ecbc2f10d0f294ad2227cf2f46f2bf9
parent07eaf6ea76900a724fc6b89e1c4ccd0713c6a174 (diff)
downloadmariadb-git-4a976545e518e70d5124e356a057c8d9624038a3.tar.gz
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.
-rw-r--r--mysql-test/suite/rpl/r/rpl_gtid_basic.result2
-rw-r--r--mysql-test/suite/rpl/t/rpl_gtid_basic.test2
2 files changed, 0 insertions, 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;