diff options
author | He Zhenxing <zhenxing.he@sun.com> | 2009-05-31 13:44:41 +0800 |
---|---|---|
committer | He Zhenxing <zhenxing.he@sun.com> | 2009-05-31 13:44:41 +0800 |
commit | e1fb88f2cc6ac8350319a5c88810779573f381b3 (patch) | |
tree | 7c9e10584a78c52b65d034c06dabe900f6c2c349 /mysql-test/suite/rpl/r/rpl_slave_skip.result | |
parent | 88e84c1fbfe9b60eeb9c3d24745ee31cfe29c38b (diff) | |
parent | 5dd1abae7d2f9e56d1c3f54077057bd92387a600 (diff) | |
download | mariadb-git-e1fb88f2cc6ac8350319a5c88810779573f381b3.tar.gz |
Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_slave_skip.result')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_slave_skip.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result index 93b3e124a01..6148de5d954 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_skip.result +++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result @@ -17,20 +17,20 @@ show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b INT) master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (c INT, d INT) -master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # use `test`; COMMIT -master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # use `test`; COMMIT -master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t2) master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # use `test`; COMMIT +master-bin.000001 # Query # # COMMIT SELECT * FROM t1; a b 1 1 |