diff options
author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-14 15:37:55 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-14 15:37:55 +0400 |
commit | d8ac8d187d09303cb6fc0ee67216f8144ce5a053 (patch) | |
tree | bb83f59549c6dbc830b480f50dbe14cad1f0c64f /mysql-test/suite/binlog/r/binlog_xa_recover.result | |
parent | 1e711c8d0471d509ec1c981bd353dfe1150fdd39 (diff) | |
parent | 0c0fe7a8623db29ae810df9b8c83b49d9ca86cc5 (diff) | |
download | mariadb-git-d8ac8d187d09303cb6fc0ee67216f8144ce5a053.tar.gz |
Merge 10.0->10.0-connect
Diffstat (limited to 'mysql-test/suite/binlog/r/binlog_xa_recover.result')
-rw-r--r-- | mysql-test/suite/binlog/r/binlog_xa_recover.result | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_xa_recover.result b/mysql-test/suite/binlog/r/binlog_xa_recover.result index 764679b0748..e9e5b23176d 100644 --- a/mysql-test/suite/binlog/r/binlog_xa_recover.result +++ b/mysql-test/suite/binlog/r/binlog_xa_recover.result @@ -43,7 +43,7 @@ master-bin.000003 # Binlog_checkpoint # # master-bin.000002 master-bin.000003 # Binlog_checkpoint # # master-bin.000003 master-bin.000003 # Gtid # # BEGIN GTID #-#-# master-bin.000003 # Table_map # # table_id: # (test.t1) -master-bin.000003 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000003 # Write_rows_v1 # # table_id: # flags: STMT_END_F master-bin.000003 # Xid # # COMMIT /* XID */ master-bin.000003 # Rotate # # master-bin.000004;pos=POS include/show_binlog_events.inc @@ -54,7 +54,7 @@ master-bin.000004 # Binlog_checkpoint # # master-bin.000003 master-bin.000004 # Binlog_checkpoint # # master-bin.000004 master-bin.000004 # Gtid # # BEGIN GTID #-#-# master-bin.000004 # Table_map # # table_id: # (test.t1) -master-bin.000004 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000004 # Write_rows_v1 # # table_id: # flags: STMT_END_F master-bin.000004 # Xid # # COMMIT /* XID */ master-bin.000004 # Rotate # # master-bin.000005;pos=POS include/show_binlog_events.inc @@ -64,11 +64,11 @@ master-bin.000005 # Gtid_list # # [#-#-#] master-bin.000005 # Binlog_checkpoint # # master-bin.000004 master-bin.000005 # Gtid # # BEGIN GTID #-#-# master-bin.000005 # Table_map # # table_id: # (test.t1) -master-bin.000005 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000005 # Write_rows_v1 # # table_id: # flags: STMT_END_F master-bin.000005 # Xid # # COMMIT /* XID */ master-bin.000005 # Gtid # # BEGIN GTID #-#-# master-bin.000005 # Table_map # # table_id: # (test.t1) -master-bin.000005 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000005 # Write_rows_v1 # # table_id: # flags: STMT_END_F master-bin.000005 # Xid # # COMMIT /* XID */ master-bin.000005 # Rotate # # master-bin.000006;pos=POS include/show_binlog_events.inc @@ -120,7 +120,7 @@ master-bin.000004 # Gtid_list # # [#-#-#] master-bin.000004 # Binlog_checkpoint # # master-bin.000001 master-bin.000004 # Gtid # # BEGIN GTID #-#-# master-bin.000004 # Table_map # # table_id: # (test.t1) -master-bin.000004 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000004 # Write_rows_v1 # # table_id: # flags: STMT_END_F master-bin.000004 # Xid # # COMMIT /* XID */ SET DEBUG_SYNC= "now SIGNAL con10_cont"; SET @old_dbug= @@global.DEBUG_DBUG; @@ -137,7 +137,7 @@ master-bin.000004 # Gtid_list # # [#-#-#] master-bin.000004 # Binlog_checkpoint # # master-bin.000001 master-bin.000004 # Gtid # # BEGIN GTID #-#-# master-bin.000004 # Table_map # # table_id: # (test.t1) -master-bin.000004 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000004 # Write_rows_v1 # # table_id: # flags: STMT_END_F master-bin.000004 # Xid # # COMMIT /* XID */ master-bin.000004 # Binlog_checkpoint # # master-bin.000002 master-bin.000004 # Binlog_checkpoint # # master-bin.000004 @@ -203,7 +203,7 @@ master-bin.000004 # Binlog_checkpoint # # master-bin.000003 master-bin.000004 # Binlog_checkpoint # # master-bin.000004 master-bin.000004 # Gtid # # BEGIN GTID #-#-# master-bin.000004 # Table_map # # table_id: # (test.t1) -master-bin.000004 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000004 # Write_rows_v1 # # table_id: # flags: STMT_END_F master-bin.000004 # Xid # # COMMIT /* XID */ master-bin.000004 # Rotate # # master-bin.000005;pos=POS DROP TABLE t1; |