summaryrefslogtreecommitdiff
path: root/mysql-test/r/multi_update.result
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/r/multi_update.result
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/r/multi_update.result')
-rw-r--r--mysql-test/r/multi_update.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result
index e991326cdce..4fdacab0725 100644
--- a/mysql-test/r/multi_update.result
+++ b/mysql-test/r/multi_update.result
@@ -605,7 +605,7 @@ a b
4 4
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Query # # BEGIN
+master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
@@ -618,7 +618,7 @@ UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a;
ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Query # # BEGIN
+master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT