summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-02-21 08:10:55 +0100
committerunknown <knielsen@knielsen-hq.org>2013-02-21 08:10:55 +0100
commitc350177a212d3c4b00e233917983064f24aff907 (patch)
tree1b7d2118b6299157160a099b70c26157d6631d17 /mysql-test/include
parent7426a466dcf364885a3cc670928b23a6f2fc2a5d (diff)
downloadmariadb-git-c350177a212d3c4b00e233917983064f24aff907.tar.gz
MDEV-26: Global transaction ID
- Add first basic mysql-test-run test case which tests switch to new master using MASTER_GTID_POS=AUTO. - When we connect with GTID, do not use any old relay logs, as they may contain the wrong events or be corrupt after crash. - Fix old bug that fails replication if we receive a heartbeat event immediately after an event was omitted in the stream from the master. - Fix rpl_end to clear Gtid_Pos_Auto, to keep check_testcase happy.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/rpl_end.inc16
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/include/rpl_end.inc b/mysql-test/include/rpl_end.inc
index f671c442153..b6535f00283 100644
--- a/mysql-test/include/rpl_end.inc
+++ b/mysql-test/include/rpl_end.inc
@@ -79,6 +79,22 @@ while ($_rpl_server)
--source include/rpl_sync.inc
--source include/rpl_stop_slaves.inc
+if (!$rpl_debug)
+{
+ --disable_query_log
+}
+--let $_rpl_server= $rpl_server_count
+while ($_rpl_server)
+{
+ --let $rpl_connection_name= server_$_rpl_server
+ --source include/rpl_connection.inc
+
+ # Clear Gtid_Pos_Auto in SHOW SLAVE STATUS to keep check_testcase happy.
+ CHANGE MASTER TO master_log_file='';
+
+ --dec $_rpl_server
+}
+
# mtr configures server 2 to be a slave before it runs the test. We
# have to restore that state now, so we change topology to 1->2.
--let $rpl_topology= none