summaryrefslogtreecommitdiff
path: root/mysql-test/t/xa_binlog.test
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-03-26 10:35:34 +0100
committerunknown <knielsen@knielsen-hq.org>2013-03-26 10:35:34 +0100
commitd9f975d08bc4480109b172e1f9c3799a375c238d (patch)
treed3a2b8fca828d150b3b25b6b688b979f6336f355 /mysql-test/t/xa_binlog.test
parenta3f651d0f635df1a29d152c7088150b3ba144b72 (diff)
downloadmariadb-git-d9f975d08bc4480109b172e1f9c3799a375c238d.tar.gz
MDEV-26: Global transaction ID
Adjust full test suite to work with GTID. Huge patch, mainly due to having to update .result file for all SHOW BINLOG EVENTS and mysqlbinlog outputs, where the new GTID events pop up. Everything was painstakingly checked to be still correct and valid .result file updates.
Diffstat (limited to 'mysql-test/t/xa_binlog.test')
-rw-r--r--mysql-test/t/xa_binlog.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/xa_binlog.test b/mysql-test/t/xa_binlog.test
index 430d45ab86a..ecbf1f4f066 100644
--- a/mysql-test/t/xa_binlog.test
+++ b/mysql-test/t/xa_binlog.test
@@ -26,7 +26,7 @@ COMMIT;
SELECT * FROM t1 ORDER BY a;
--replace_column 2 # 5 #
---replace_regex /xid=[0-9]+/xid=XX/
-SHOW BINLOG EVENTS LIMIT 2,9;
+--replace_regex /xid=[0-9]+/xid=XX/ /GTID [0-9]+-[0-9]+-[0-9]+/GTID #-#-#/
+SHOW BINLOG EVENTS LIMIT 3,9;
DROP TABLE t1;