summaryrefslogtreecommitdiff
path: root/mysql-test/r/sp_trans_log.result
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-04-17 15:17:01 +0200
committerunknown <knielsen@knielsen-hq.org>2013-04-17 15:17:01 +0200
commit0e7410a154560486ce4e0c975f122a0b15853bb1 (patch)
treee65ba67f602f6c99a52a1953b2172043476a5930 /mysql-test/r/sp_trans_log.result
parentf398ced7f05e64b0f2bdb8e0a70de907aff9e1eb (diff)
parent30b2c64c4e87f8924fe817f5c607ae90a990e9e5 (diff)
downloadmariadb-git-0e7410a154560486ce4e0c975f122a0b15853bb1.tar.gz
Merge 10.0-base -> 10.0 (GTID).
Diffstat (limited to 'mysql-test/r/sp_trans_log.result')
-rw-r--r--mysql-test/r/sp_trans_log.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/sp_trans_log.result b/mysql-test/r/sp_trans_log.result
index d2e1eb18efb..5ac6ce3c08e 100644
--- a/mysql-test/r/sp_trans_log.result
+++ b/mysql-test/r/sp_trans_log.result
@@ -16,7 +16,7 @@ insert into t2 values (bug23333(),1);
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
include/show_binlog_events.inc
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.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT