summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/binlog_row_binlog.result408
-rw-r--r--mysql-test/r/binlog_row_blackhole.result36
-rw-r--r--mysql-test/r/binlog_row_ctype_cp932.result5
-rw-r--r--mysql-test/r/binlog_row_ctype_ucs.result4
-rw-r--r--mysql-test/r/binlog_row_insert_select.result8
-rw-r--r--mysql-test/r/binlog_row_mix_innodb_myisam.result144
-rw-r--r--mysql-test/r/ctype_cp932_binlog_row.result4
-rw-r--r--mysql-test/r/rpl_row_basic_11bugs.result4
-rw-r--r--mysql-test/r/rpl_row_basic_2myisam.result38
-rw-r--r--mysql-test/r/rpl_row_basic_3innodb.result38
-rw-r--r--mysql-test/r/rpl_row_charset.result70
-rw-r--r--mysql-test/r/rpl_row_create_table.result12
-rw-r--r--mysql-test/r/rpl_row_delayed_ins.result4
-rw-r--r--mysql-test/r/rpl_row_log.result46
-rw-r--r--mysql-test/r/rpl_row_log_innodb.result46
-rw-r--r--mysql-test/r/rpl_row_max_relay_size.result2
-rw-r--r--mysql-test/r/rpl_row_sp008.result12
17 files changed, 441 insertions, 440 deletions
diff --git a/mysql-test/r/binlog_row_binlog.result b/mysql-test/r/binlog_row_binlog.result
index df69ca29b2f..6cb086109b4 100644
--- a/mysql-test/r/binlog_row_binlog.result
+++ b/mysql-test/r/binlog_row_binlog.result
@@ -13,12 +13,12 @@ Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1 (a int) engine=bdb
master-bin.000001 # Query 1 # use `test`; create table t2 (a int) engine=innodb
master-bin.000001 # Query 1 # use `test`; BEGIN
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
master-bin.000001 # Query 1 # use `test`; BEGIN
-master-bin.000001 # Table_map 1 # test.t2
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t2)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Xid 1 # COMMIT /* xid= */
drop table t1,t2;
reset master;
@@ -30,206 +30,206 @@ show binlog events in 'master-bin.000001' from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1 (n int) engine=innodb
master-bin.000001 # Query 1 # use `test`; BEGIN
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Xid 1 # COMMIT /* xid= */
master-bin.000001 # Rotate 1 # master-bin.000002;pos=4
show binlog events in 'master-bin.000002' from 102;
diff --git a/mysql-test/r/binlog_row_blackhole.result b/mysql-test/r/binlog_row_blackhole.result
index 7b1e64b00d8..aa5c943de00 100644
--- a/mysql-test/r/binlog_row_blackhole.result
+++ b/mysql-test/r/binlog_row_blackhole.result
@@ -109,33 +109,33 @@ Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; drop table t1,t2
master-bin.000001 # Query 1 # use `test`; create table t1 (a int) engine=blackhole
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
master-bin.000001 # Query 1 # use `test`; create table t2 (a varchar(200)) engine=blackhole
-master-bin.000001 # Table_map 1 # test.t2
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t2)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
master-bin.000001 # Query 1 # use `test`; alter table t1 add b int
master-bin.000001 # Query 1 # use `test`; alter table t1 drop b
master-bin.000001 # Query 1 # use `test`; create table t3 like t1
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
drop table t1,t2,t3;
reset master;
@@ -153,6 +153,6 @@ Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; create table t1 (a int) engine=blackhole
master-bin.000001 # Query 1 # use `test`; BEGIN
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; COMMIT
diff --git a/mysql-test/r/binlog_row_ctype_cp932.result b/mysql-test/r/binlog_row_ctype_cp932.result
index 6d213158ef6..4e0ba6f6a20 100644
--- a/mysql-test/r/binlog_row_ctype_cp932.result
+++ b/mysql-test/r/binlog_row_ctype_cp932.result
@@ -11323,8 +11323,8 @@ EXECUTE stmt1 USING @var1;
SHOW BINLOG EVENTS FROM 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 189 use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001 189 Table_map 1 228 test.t1
-master-bin.000001 228 Write_rows 1 262
+master-bin.000001 189 Table_map 1 228 table_id: # (test.t1)
+master-bin.000001 228 Write_rows 1 262 table_id: # flags: STMT_END_F
SELECT HEX(f1) FROM t1;
HEX(f1)
8300
@@ -11366,4 +11366,3 @@ col1
a
a
a
-drop table t1;
diff --git a/mysql-test/r/binlog_row_ctype_ucs.result b/mysql-test/r/binlog_row_ctype_ucs.result
index 12f7062d38a..5feb17cde13 100644
--- a/mysql-test/r/binlog_row_ctype_ucs.result
+++ b/mysql-test/r/binlog_row_ctype_ucs.result
@@ -5,8 +5,8 @@ reset master;
insert into t2 values (@v);
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 102 Table_map 1 141 test.t2
-master-bin.000001 141 Write_rows 1 231
+master-bin.000001 102 Table_map 1 141 table_id: # (test.t2)
+master-bin.000001 141 Write_rows 1 231 table_id: # flags: STMT_END_F
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
ROLLBACK;
diff --git a/mysql-test/r/binlog_row_insert_select.result b/mysql-test/r/binlog_row_insert_select.result
index 27c515e5781..870d255d004 100644
--- a/mysql-test/r/binlog_row_insert_select.result
+++ b/mysql-test/r/binlog_row_insert_select.result
@@ -4,12 +4,12 @@ create table t2(a int);
insert into t2 values(1),(2);
reset master;
insert into t1 select * from t2;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'a'
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 102 Table_map 1 141 test.t1
-master-bin.000001 141 Write_rows 1 175
+master-bin.000001 102 Table_map 1 141 table_id: # (test.t1)
+master-bin.000001 141 Write_rows 1 175 table_id: # flags: STMT_END_F
select * from t1;
a
1
@@ -19,7 +19,7 @@ create table t1(a int);
insert into t1 values(1),(1);
reset master;
create table t2(unique(a)) select a from t1;
-ERROR 23000: Duplicate entry '1' for key 1
+ERROR 23000: Duplicate entry '1' for key 'a'
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
diff --git a/mysql-test/r/binlog_row_mix_innodb_myisam.result b/mysql-test/r/binlog_row_mix_innodb_myisam.result
index 4ebbec4a424..324527fa036 100644
--- a/mysql-test/r/binlog_row_mix_innodb_myisam.result
+++ b/mysql-test/r/binlog_row_mix_innodb_myisam.result
@@ -9,10 +9,10 @@ commit;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Table_map 1 # test.t1
-master-bin.000001 209 Write_rows 1 #
-master-bin.000001 243 Table_map 1 # test.t2
-master-bin.000001 282 Write_rows 1 #
+master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 243 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
delete from t1;
delete from t2;
@@ -26,10 +26,10 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Table_map 1 # test.t1
-master-bin.000001 209 Write_rows 1 #
-master-bin.000001 243 Table_map 1 # test.t2
-master-bin.000001 282 Write_rows 1 #
+master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 243 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 316 Query 1 # use `test`; ROLLBACK
delete from t1;
delete from t2;
@@ -46,13 +46,13 @@ commit;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Table_map 1 # test.t1
-master-bin.000001 209 Write_rows 1 #
+master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 243 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 328 Table_map 1 # test.t1
-master-bin.000001 367 Write_rows 1 #
-master-bin.000001 401 Table_map 1 # test.t2
-master-bin.000001 440 Write_rows 1 #
+master-bin.000001 328 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 367 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 401 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 440 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 479 Query 1 # use `test`; rollback to savepoint my_savepoint
master-bin.000001 576 Xid 1 # COMMIT /* xid= */
delete from t1;
@@ -75,16 +75,16 @@ a
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Table_map 1 # test.t1
-master-bin.000001 209 Write_rows 1 #
+master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 243 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 328 Table_map 1 # test.t1
-master-bin.000001 367 Write_rows 1 #
-master-bin.000001 401 Table_map 1 # test.t2
-master-bin.000001 440 Write_rows 1 #
+master-bin.000001 328 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 367 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 401 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 440 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 479 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 576 Table_map 1 # test.t1
-master-bin.000001 615 Write_rows 1 #
+master-bin.000001 576 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 615 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 649 Xid 1 # COMMIT /* xid= */
delete from t1;
delete from t2;
@@ -101,10 +101,10 @@ get_lock("a",10)
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Table_map 1 # test.t1
-master-bin.000001 209 Write_rows 1 #
-master-bin.000001 243 Table_map 1 # test.t2
-master-bin.000001 282 Write_rows 1 #
+master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 243 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 316 Query 1 # use `test`; ROLLBACK
delete from t1;
delete from t2;
@@ -113,11 +113,11 @@ insert into t1 values(9);
insert into t2 select * from t1;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 102 Table_map 1 # test.t1
-master-bin.000001 141 Write_rows 1 #
+master-bin.000001 102 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 141 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 175 Xid 1 # COMMIT /* xid= */
-master-bin.000001 202 Table_map 1 # test.t2
-master-bin.000001 241 Write_rows 1 #
+master-bin.000001 202 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 241 Write_rows 1 # table_id: # flags: STMT_END_F
delete from t1;
delete from t2;
reset master;
@@ -126,23 +126,23 @@ begin;
insert into t2 select * from t1;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 102 Table_map 1 # test.t1
-master-bin.000001 141 Write_rows 1 #
+master-bin.000001 102 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 141 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 175 Xid 1 # COMMIT /* xid= */
-master-bin.000001 202 Table_map 1 # test.t2
-master-bin.000001 241 Write_rows 1 #
+master-bin.000001 202 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 241 Write_rows 1 # table_id: # flags: STMT_END_F
insert into t1 values(11);
commit;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 102 Table_map 1 # test.t1
-master-bin.000001 141 Write_rows 1 #
+master-bin.000001 102 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 141 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 175 Xid 1 # COMMIT /* xid= */
-master-bin.000001 202 Table_map 1 # test.t2
-master-bin.000001 241 Write_rows 1 #
+master-bin.000001 202 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 241 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 275 Query 1 # use `test`; BEGIN
-master-bin.000001 343 Table_map 1 # test.t1
-master-bin.000001 382 Write_rows 1 #
+master-bin.000001 343 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 382 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 416 Xid 1 # COMMIT /* xid= */
alter table t2 engine=INNODB;
delete from t1;
@@ -155,10 +155,10 @@ commit;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Table_map 1 # test.t1
-master-bin.000001 209 Write_rows 1 #
-master-bin.000001 243 Table_map 1 # test.t2
-master-bin.000001 282 Write_rows 1 #
+master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 243 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
delete from t1;
delete from t2;
@@ -182,8 +182,8 @@ commit;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Table_map 1 # test.t1
-master-bin.000001 209 Write_rows 1 #
+master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 243 Xid 1 # COMMIT /* xid= */
delete from t1;
delete from t2;
@@ -203,14 +203,14 @@ a
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Table_map 1 # test.t1
-master-bin.000001 209 Write_rows 1 #
-master-bin.000001 243 Table_map 1 # test.t1
-master-bin.000001 282 Write_rows 1 #
+master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 243 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
delete from t1;
delete from t2;
-alter table t2 type=MyISAM;
+alter table t2 engine=MyISAM;
insert into t1 values (1);
begin;
select * from t1 for update;
@@ -257,31 +257,31 @@ get_lock("lock1",60)
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Table_map 1 # test.t1
-master-bin.000001 209 Write_rows 1 #
-master-bin.000001 243 Table_map 1 # test.t1
-master-bin.000001 282 Write_rows 1 #
+master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 243 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
-master-bin.000001 343 Table_map 1 # test.t1
+master-bin.000001 343 Table_map 1 # table_id: # (test.t1)
master-bin.000001 382 Query 1 # use `test`; delete from t1
master-bin.000001 459 Xid 1 # COMMIT /* xid= */
-master-bin.000001 486 Table_map 1 # test.t2
+master-bin.000001 486 Table_map 1 # table_id: # (test.t2)
master-bin.000001 525 Query 1 # use `test`; delete from t2
master-bin.000001 602 Xid 1 # COMMIT /* xid= */
-master-bin.000001 629 Query 1 # use `test`; alter table t2 type=MyISAM
-master-bin.000001 718 Table_map 1 # test.t1
-master-bin.000001 757 Write_rows 1 #
-master-bin.000001 791 Xid 1 # COMMIT /* xid= */
-master-bin.000001 818 Query 1 # use `test`; BEGIN
-master-bin.000001 886 Table_map 1 # test.t1
-master-bin.000001 925 Write_rows 1 #
-master-bin.000001 954 Xid 1 # COMMIT /* xid= */
-master-bin.000001 981 Query 1 # use `test`; drop table t1,t2
-master-bin.000001 1060 Query 1 # use `test`; create table t0 (n int)
-master-bin.000001 1146 Table_map 1 # test.t0
-master-bin.000001 1185 Write_rows 1 #
-master-bin.000001 1219 Table_map 1 # test.t0
-master-bin.000001 1258 Write_rows 1 #
-master-bin.000001 1292 Query 1 # use `test`; create table t2 (n int) engine=innodb
+master-bin.000001 629 Query 1 # use `test`; alter table t2 engine=MyISAM
+master-bin.000001 720 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 759 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 793 Xid 1 # COMMIT /* xid= */
+master-bin.000001 820 Query 1 # use `test`; BEGIN
+master-bin.000001 888 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 927 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 956 Xid 1 # COMMIT /* xid= */
+master-bin.000001 983 Query 1 # use `test`; drop table t1,t2
+master-bin.000001 1062 Query 1 # use `test`; create table t0 (n int)
+master-bin.000001 1148 Table_map 1 # table_id: # (test.t0)
+master-bin.000001 1187 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 1221 Table_map 1 # table_id: # (test.t0)
+master-bin.000001 1260 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 1294 Query 1 # use `test`; create table t2 (n int) engine=innodb
do release_lock("lock1");
drop table t0,t2;
diff --git a/mysql-test/r/ctype_cp932_binlog_row.result b/mysql-test/r/ctype_cp932_binlog_row.result
index 913e8125619..f1a64241fbb 100644
--- a/mysql-test/r/ctype_cp932_binlog_row.result
+++ b/mysql-test/r/ctype_cp932_binlog_row.result
@@ -9,8 +9,8 @@ EXECUTE stmt1 USING @var1;
SHOW BINLOG EVENTS FROM 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
SELECT HEX(f1) FROM t1;
HEX(f1)
8300
diff --git a/mysql-test/r/rpl_row_basic_11bugs.result b/mysql-test/r/rpl_row_basic_11bugs.result
index 772a22babfe..4e8c1ad1c9b 100644
--- a/mysql-test/r/rpl_row_basic_11bugs.result
+++ b/mysql-test/r/rpl_row_basic_11bugs.result
@@ -28,8 +28,8 @@ INSERT INTO t2 VALUES (3,3), (4,4);
SHOW BINLOG EVENTS FROM 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 195 use `test`; CREATE TABLE t1 (a INT, b INT)
-master-bin.000001 195 Table_map 1 235 test.t1
-master-bin.000001 235 Write_rows 1 282
+master-bin.000001 195 Table_map 1 235 table_id: # (test.t1)
+master-bin.000001 235 Write_rows 1 282 table_id: # flags: STMT_END_F
**** On Slave ****
SHOW DATABASES;
Database
diff --git a/mysql-test/r/rpl_row_basic_2myisam.result b/mysql-test/r/rpl_row_basic_2myisam.result
index 12a8d8282e3..a6877b27b95 100644
--- a/mysql-test/r/rpl_row_basic_2myisam.result
+++ b/mysql-test/r/rpl_row_basic_2myisam.result
@@ -363,7 +363,6 @@ SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
C1 HEX(B1) HEX(B2)
1 NULL 0
CREATE TABLE t7 (C1 INT PRIMARY KEY, C2 INT) ENGINE = 'MYISAM' ;
-
--- on slave: original values ---
INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
SELECT * FROM t7 ORDER BY C1;
@@ -371,7 +370,6 @@ C1 C2
1 3
2 6
3 9
-
--- on master: new values inserted ---
INSERT INTO t7 VALUES (1,2), (2,4), (3,6);
SELECT * FROM t7 ORDER BY C1;
@@ -379,48 +377,42 @@ C1 C2
1 2
2 4
3 6
-
--- on slave: old values should be overwritten by replicated values ---
SELECT * FROM t7 ORDER BY C1;
C1 C2
1 2
2 4
3 6
-
--- on master ---
-DROP TABLE t7;
-CREATE TABLE t7 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = 'MYISAM' ;
-INSERT INTO t7 VALUES (99,99,99);
-INSERT INTO t7 VALUES (99,22,33);
-ERROR 23000: Duplicate entry '99' for key 1
-INSERT INTO t7 VALUES (11,99,33);
-ERROR 23000: Duplicate entry '99' for key 2
-INSERT INTO t7 VALUES (11,22,99);
-ERROR 23000: Duplicate entry '99' for key 3
-SELECT * FROM t7 ORDER BY a;
+CREATE TABLE t8 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = 'MYISAM' ;
+INSERT INTO t8 VALUES (99,99,99);
+INSERT INTO t8 VALUES (99,22,33);
+ERROR 23000: Duplicate entry '99' for key 'PRIMARY'
+INSERT INTO t8 VALUES (11,99,33);
+ERROR 23000: Duplicate entry '99' for key 'b'
+INSERT INTO t8 VALUES (11,22,99);
+ERROR 23000: Duplicate entry '99' for key 'c'
+SELECT * FROM t8 ORDER BY a;
a b c
99 99 99
-
--- on slave ---
-SELECT * FROM t7 ORDER BY a;
+SELECT * FROM t8 ORDER BY a;
a b c
99 99 99
-INSERT INTO t7 VALUES (1,2,3), (2,4,6), (3,6,9);
-SELECT * FROM t7 ORDER BY a;
+INSERT INTO t8 VALUES (1,2,3), (2,4,6), (3,6,9);
+SELECT * FROM t8 ORDER BY a;
a b c
1 2 3
2 4 6
3 6 9
99 99 99
-
--- on master ---
-INSERT INTO t7 VALUES (2,4,8);
-
+INSERT INTO t8 VALUES (2,4,8);
--- on slave ---
-SELECT * FROM t7 ORDER BY a;
+SELECT * FROM t8 ORDER BY a;
a b c
1 2 3
2 4 8
3 6 9
99 99 99
-DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
diff --git a/mysql-test/r/rpl_row_basic_3innodb.result b/mysql-test/r/rpl_row_basic_3innodb.result
index ed9b231e1a1..4c6ec627db5 100644
--- a/mysql-test/r/rpl_row_basic_3innodb.result
+++ b/mysql-test/r/rpl_row_basic_3innodb.result
@@ -363,7 +363,6 @@ SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
C1 HEX(B1) HEX(B2)
1 NULL 0
CREATE TABLE t7 (C1 INT PRIMARY KEY, C2 INT) ENGINE = 'INNODB' ;
-
--- on slave: original values ---
INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
SELECT * FROM t7 ORDER BY C1;
@@ -371,7 +370,6 @@ C1 C2
1 3
2 6
3 9
-
--- on master: new values inserted ---
INSERT INTO t7 VALUES (1,2), (2,4), (3,6);
SELECT * FROM t7 ORDER BY C1;
@@ -379,48 +377,42 @@ C1 C2
1 2
2 4
3 6
-
--- on slave: old values should be overwritten by replicated values ---
SELECT * FROM t7 ORDER BY C1;
C1 C2
1 2
2 4
3 6
-
--- on master ---
-DROP TABLE t7;
-CREATE TABLE t7 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = 'INNODB' ;
-INSERT INTO t7 VALUES (99,99,99);
-INSERT INTO t7 VALUES (99,22,33);
-ERROR 23000: Duplicate entry '99' for key 1
-INSERT INTO t7 VALUES (11,99,33);
-ERROR 23000: Duplicate entry '99' for key 2
-INSERT INTO t7 VALUES (11,22,99);
-ERROR 23000: Duplicate entry '99' for key 3
-SELECT * FROM t7 ORDER BY a;
+CREATE TABLE t8 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = 'INNODB' ;
+INSERT INTO t8 VALUES (99,99,99);
+INSERT INTO t8 VALUES (99,22,33);
+ERROR 23000: Duplicate entry '99' for key 'PRIMARY'
+INSERT INTO t8 VALUES (11,99,33);
+ERROR 23000: Duplicate entry '99' for key 'b'
+INSERT INTO t8 VALUES (11,22,99);
+ERROR 23000: Duplicate entry '99' for key 'c'
+SELECT * FROM t8 ORDER BY a;
a b c
99 99 99
-
--- on slave ---
-SELECT * FROM t7 ORDER BY a;
+SELECT * FROM t8 ORDER BY a;
a b c
99 99 99
-INSERT INTO t7 VALUES (1,2,3), (2,4,6), (3,6,9);
-SELECT * FROM t7 ORDER BY a;
+INSERT INTO t8 VALUES (1,2,3), (2,4,6), (3,6,9);
+SELECT * FROM t8 ORDER BY a;
a b c
1 2 3
2 4 6
3 6 9
99 99 99
-
--- on master ---
-INSERT INTO t7 VALUES (2,4,8);
-
+INSERT INTO t8 VALUES (2,4,8);
--- on slave ---
-SELECT * FROM t7 ORDER BY a;
+SELECT * FROM t8 ORDER BY a;
a b c
1 2 3
2 4 8
3 6 9
99 99 99
-DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
diff --git a/mysql-test/r/rpl_row_charset.result b/mysql-test/r/rpl_row_charset.result
index 4108d0c6d90..060dffbfe2e 100644
--- a/mysql-test/r/rpl_row_charset.result
+++ b/mysql-test/r/rpl_row_charset.result
@@ -112,46 +112,56 @@ drop database mysqltest3;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # drop database if exists mysqltest2
-master-bin.000001 # Table_map 1 # mysql.proc
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (mysql.proc)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysql.event)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # drop database if exists mysqltest3
-master-bin.000001 # Table_map 1 # mysql.proc
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (mysql.proc)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysql.event)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # create database mysqltest2 character set latin2
master-bin.000001 # Query 1 # create database mysqltest3
master-bin.000001 # Query 1 # drop database mysqltest3
-master-bin.000001 # Table_map 1 # mysql.proc
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (mysql.proc)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysql.event)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # create database mysqltest3
master-bin.000001 # Query 1 # use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1
-master-bin.000001 # Table_map 1 # mysqltest2.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # drop database mysqltest2
-master-bin.000001 # Table_map 1 # mysql.proc
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (mysql.proc)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysql.event)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # drop database mysqltest3
-master-bin.000001 # Table_map 1 # mysql.proc
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (mysql.proc)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (mysql.event)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
select "--- --global--" as "";
--- --global--
diff --git a/mysql-test/r/rpl_row_create_table.result b/mysql-test/r/rpl_row_create_table.result
index 0a443d243ac..e35dcc2abb5 100644
--- a/mysql-test/r/rpl_row_create_table.result
+++ b/mysql-test/r/rpl_row_create_table.result
@@ -126,12 +126,12 @@ NULL 4 2
NULL 5 10
NULL 6 12
CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'b'
SHOW BINLOG EVENTS FROM 1326;
Log_name Pos Event_type Server_id End_log_pos Info
CREATE TABLE t7 (a INT, b INT UNIQUE);
INSERT INTO t7 SELECT a,b FROM tt3;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'b'
SELECT * FROM t7 ORDER BY a,b;
a b
1 2
@@ -140,8 +140,8 @@ a b
SHOW BINLOG EVENTS FROM 1326;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 1326 Query 1 1426 use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
-master-bin.000001 1426 Table_map 1 1466 test.t7
-master-bin.000001 1466 Write_rows 1 1522
+master-bin.000001 1426 Table_map 1 1466 table_id: # (test.t7)
+master-bin.000001 1466 Write_rows 1 1522 table_id: # flags: STMT_END_F
SELECT * FROM t7 ORDER BY a,b;
a b
1 2
@@ -156,8 +156,8 @@ Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
SHOW BINLOG EVENTS FROM 1522;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 1522 Table_map 1 1562 test.t7
-master-bin.000001 1562 Write_rows 1 1618
+master-bin.000001 1522 Table_map 1 1562 table_id: # (test.t7)
+master-bin.000001 1562 Write_rows 1 1618 table_id: # flags: STMT_END_F
SELECT * FROM t7 ORDER BY a,b;
a b
1 2
diff --git a/mysql-test/r/rpl_row_delayed_ins.result b/mysql-test/r/rpl_row_delayed_ins.result
index 7ed817b5780..b93aaae9112 100644
--- a/mysql-test/r/rpl_row_delayed_ins.result
+++ b/mysql-test/r/rpl_row_delayed_ins.result
@@ -16,8 +16,8 @@ show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 222 use `test`; create table t1(a int not null primary key) engine=myisam
-master-bin.000001 222 Table_map 1 261 test.t1
-master-bin.000001 261 Write_rows 1 305
+master-bin.000001 222 Table_map 1 261 table_id: # (test.t1)
+master-bin.000001 261 Write_rows 1 305 table_id: # flags: STMT_END_F
master-bin.000001 305 Query 1 380 use `test`; flush tables
select * from t1;
a
diff --git a/mysql-test/r/rpl_row_log.result b/mysql-test/r/rpl_row_log.result
index a5317975302..1265ff930f1 100644
--- a/mysql-test/r/rpl_row_log.result
+++ b/mysql-test/r/rpl_row_log.result
@@ -21,12 +21,12 @@ show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; drop table t1
show binlog events from 102 limit 1;
Log_name Pos Event_type Server_id End_log_pos Info
@@ -34,10 +34,10 @@ master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_in
show binlog events from 102 limit 2;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-master-bin.000001 # Table_map 1 # test.t1
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
show binlog events from 102 limit 2,1;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
flush logs;
create table t5 (a int)ENGINE=MyISAM;
drop table t5;
@@ -51,42 +51,44 @@ show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Rotate 1 # master-bin.000002;pos=4
show binlog events in 'master-bin.000002';
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
+master-bin.000002 # Table_map 1 # table_id: # (mysql.slow_log)
+master-bin.000002 # Table_map 1 # table_id: # (mysql.general_log)
master-bin.000002 # Query 1 # use `test`; create table t5 (a int)ENGINE=MyISAM
master-bin.000002 # Query 1 # use `test`; drop table t5
master-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=MyISAM
-master-bin.000002 # Table_map 1 # test.t1
-master-bin.000002 # Write_rows 1 #
+master-bin.000002 # Table_map 1 # table_id: # (test.t1)
+master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000002 # Query 1 # use `test`; drop table t1
show binary logs;
Log_name File_size
master-bin.000001 1332
-master-bin.000002 525
+master-bin.000002 635
start slave;
show binary logs;
Log_name File_size
slave-bin.000001 1506
-slave-bin.000002 350
+slave-bin.000002 460
show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-slave-bin.000001 # Table_map 1 # test.t1
-slave-bin.000001 # Write_rows 1 #
+slave-bin.000001 # Table_map 1 # table_id: # (test.t1)
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-bin.000001 # Query 1 # use `test`; drop table t1
slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
-slave-bin.000001 # Table_map 1 # test.t1
-slave-bin.000001 # Write_rows 1 #
+slave-bin.000001 # Table_map 1 # table_id: # (test.t1)
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-bin.000001 # Query 1 # use `test`; drop table t1
slave-bin.000001 # Query 1 # use `test`; create table t5 (a int)ENGINE=MyISAM
slave-bin.000001 # Query 1 # use `test`; drop table t5
@@ -94,12 +96,14 @@ slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
show binlog events in 'slave-bin.000002' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
+slave-bin.000002 # Table_map 2 # table_id: # (mysql.slow_log)
+slave-bin.000002 # Table_map 2 # table_id: # (mysql.general_log)
slave-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=MyISAM
-slave-bin.000002 # Table_map 1 # test.t1
-slave-bin.000002 # Write_rows 1 #
+slave-bin.000002 # Table_map 1 # table_id: # (test.t1)
+slave-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-bin.000002 # Query 1 # use `test`; drop table t1
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 525 # # master-bin.000002 Yes Yes # 0 0 525 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 635 # # master-bin.000002 Yes Yes # 0 0 635 # None 0 No #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
diff --git a/mysql-test/r/rpl_row_log_innodb.result b/mysql-test/r/rpl_row_log_innodb.result
index 52b5219cf43..6c378bede1b 100644
--- a/mysql-test/r/rpl_row_log_innodb.result
+++ b/mysql-test/r/rpl_row_log_innodb.result
@@ -21,13 +21,13 @@ show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Xid 1 # COMMIT /* XID */
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=InnoDB
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Xid 1 # COMMIT /* XID */
master-bin.000001 # Query 1 # use `test`; drop table t1
show binlog events from 102 limit 1;
@@ -36,10 +36,10 @@ master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_in
show binlog events from 102 limit 2;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
-master-bin.000001 # Table_map 1 # test.t1
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
show binlog events from 102 limit 2,1;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
flush logs;
create table t5 (a int)ENGINE=InnoDB;
drop table t5;
@@ -53,46 +53,48 @@ show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Xid 1 # COMMIT /* XID */
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=InnoDB
-master-bin.000001 # Table_map 1 # test.t1
-master-bin.000001 # Write_rows 1 #
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Xid 1 # COMMIT /* XID */
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Rotate 1 # master-bin.000002;pos=4
show binlog events in 'master-bin.000002';
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
+master-bin.000002 # Table_map 1 # table_id: # (mysql.slow_log)
+master-bin.000002 # Table_map 1 # table_id: # (mysql.general_log)
master-bin.000002 # Query 1 # use `test`; create table t5 (a int)ENGINE=InnoDB
master-bin.000002 # Query 1 # use `test`; drop table t5
master-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=InnoDB
-master-bin.000002 # Table_map 1 # test.t1
-master-bin.000002 # Write_rows 1 #
+master-bin.000002 # Table_map 1 # table_id: # (test.t1)
+master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000002 # Xid 1 # COMMIT /* XID */
master-bin.000002 # Query 1 # use `test`; drop table t1
show binary logs;
Log_name File_size
master-bin.000001 1386
-master-bin.000002 552
+master-bin.000002 662
start slave;
show binary logs;
Log_name File_size
slave-bin.000001 1560
-slave-bin.000002 377
+slave-bin.000002 487
show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
-slave-bin.000001 # Table_map 1 # test.t1
-slave-bin.000001 # Write_rows 1 #
+slave-bin.000001 # Table_map 1 # table_id: # (test.t1)
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-bin.000001 # Xid 1 # COMMIT /* XID */
slave-bin.000001 # Query 1 # use `test`; drop table t1
slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=InnoDB
-slave-bin.000001 # Table_map 1 # test.t1
-slave-bin.000001 # Write_rows 1 #
+slave-bin.000001 # Table_map 1 # table_id: # (test.t1)
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-bin.000001 # Xid 1 # COMMIT /* XID */
slave-bin.000001 # Query 1 # use `test`; drop table t1
slave-bin.000001 # Query 1 # use `test`; create table t5 (a int)ENGINE=InnoDB
@@ -101,13 +103,15 @@ slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
show binlog events in 'slave-bin.000002' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
+slave-bin.000002 # Table_map 2 # table_id: # (mysql.slow_log)
+slave-bin.000002 # Table_map 2 # table_id: # (mysql.general_log)
slave-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=InnoDB
-slave-bin.000002 # Table_map 1 # test.t1
-slave-bin.000002 # Write_rows 1 #
+slave-bin.000002 # Table_map 1 # table_id: # (test.t1)
+slave-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-bin.000002 # Xid 1 # COMMIT /* XID */
slave-bin.000002 # Query 1 # use `test`; drop table t1
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 552 # # master-bin.000002 Yes Yes # 0 0 552 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 662 # # master-bin.000002 Yes Yes # 0 0 662 # None 0 No #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
diff --git a/mysql-test/r/rpl_row_max_relay_size.result b/mysql-test/r/rpl_row_max_relay_size.result
index 6146d623ec5..b7afe0b0515 100644
--- a/mysql-test/r/rpl_row_max_relay_size.result
+++ b/mysql-test/r/rpl_row_max_relay_size.result
@@ -58,4 +58,4 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000002 102 <Binlog_Ignore_DB>
+master-bin.000002 212 <Binlog_Ignore_DB>
diff --git a/mysql-test/r/rpl_row_sp008.result b/mysql-test/r/rpl_row_sp008.result
index 57606e26f19..633709e83ca 100644
--- a/mysql-test/r/rpl_row_sp008.result
+++ b/mysql-test/r/rpl_row_sp008.result
@@ -35,11 +35,11 @@ master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 193 use `test`; DROP TABLE IF EXISTS test.t2
master-bin.000001 193 Query 1 299 use `test`; CREATE TABLE test.t1 (a INT,PRIMARY KEY(a))
master-bin.000001 299 Query 1 405 use `test`; CREATE TABLE test.t2 (a INT,PRIMARY KEY(a))
-master-bin.000001 405 Table_map 1 444 test.t1
-master-bin.000001 444 Write_rows 1 483
-master-bin.000001 483 Table_map 1 540 mysql.proc
-master-bin.000001 540 Write_rows 1 723
-master-bin.000001 723 Table_map 1 762 test.t2
-master-bin.000001 762 Write_rows 1 796
+master-bin.000001 405 Table_map 1 444 table_id: # (test.t1)
+master-bin.000001 444 Write_rows 1 483 table_id: # flags: STMT_END_F
+master-bin.000001 483 Table_map 1 540 table_id: # (mysql.proc)
+master-bin.000001 540 Write_rows 1 723 table_id: # flags: STMT_END_F
+master-bin.000001 723 Table_map 1 762 table_id: # (test.t2)
+master-bin.000001 762 Write_rows 1 796 table_id: # flags: STMT_END_F
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1;
View Lorry Controller Status