MDEV-8426 mysqlbinlog: "Corrupted replication event was detected.

Not printing the value" with binlog-row-image=minimal" Merged Rows_log_event::print_verbose_one_row() and log_event_print_value() with MySQL 5.7 Added flush after writing of Table_map_log_event() to fix wrong order of lines in output. This causes a lot of changes in some test results.
author: Monty <monty@mariadb.org> 2015-11-10 13:40:15 +0200
committer: Monty <monty@mariadb.org> 2015-11-10 13:46:57 +0200
commit: 2f63e2e2a0575d60572b8fdef55f90173c36b10b (patch)
tree: 8b5cefd99cf610641b4b138608bd4c404fe9d3c3
parent: 78771189e769cf5f1444c2c51a3813d45ac120e2 (diff)
download: mariadb-git-2f63e2e2a0575d60572b8fdef55f90173c36b10b.tar.gz
10 files changed, 1372 insertions, 953 deletions
diff --git a/mysql-test/r/mysqlbinlog_row_minimal.result b/mysql-test/r/mysqlbinlog_row_minimal.result
new file mode 100644
index 00000000000..02abc595be9
--- /dev/null
+++ b/mysql-test/r/mysqlbinlog_row_minimal.result
@@ -0,0 +1,300 @@
+CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1));
+CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1));
+INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "");
+INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL);
+INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A");
+INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A");
+INSERT INTO t2 SELECT * FROM t1;
+UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL;
+DELETE FROM t1;
+DELETE FROM t2;
+FLUSH BINARY LOGS;
+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
+DELIMITER /*!*/;
+# at 4
+#<date> server id 1  end_log_pos 249 	Start: xxx
+ROLLBACK/*!*/;
+# at 249
+#<date> server id 1  end_log_pos 274 	Gtid list []
+# at 274
+#<date> server id 1  end_log_pos 314 	Binlog checkpoint master-bin.000001
+# at 314
+#<date> server id 1  end_log_pos 352 	GTID 0-1-1 ddl
+/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
+/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
+/*!100001 SET @@session.server_id=1*//*!*/;
+/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
+# at 352
+#<date> server id 1  end_log_pos 532 	Query	thread_id=4	exec_time=0	error_code=0
+use `test`/*!*/;
+SET TIMESTAMP=X/*!*/;
+SET @@session.pseudo_thread_id=4/*!*/;
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
+/*!\C latin1 *//*!*/;
+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
+SET @@session.lc_time_names=0/*!*/;
+SET @@session.collation_database=DEFAULT/*!*/;
+CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1))
+/*!*/;
+# at 532
+#<date> server id 1  end_log_pos 570 	GTID 0-1-2 ddl
+/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
+# at 570
+#<date> server id 1  end_log_pos 743 	Query	thread_id=4	exec_time=0	error_code=0
+SET TIMESTAMP=X/*!*/;
+CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1))
+/*!*/;
+# at 743
+#<date> server id 1  end_log_pos 781 	GTID 0-1-3
+/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
+BEGIN
+/*!*/;
+# at 781
+#<date> server id 1  end_log_pos 833 	Table_map: `test`.`t1` mapped to number 30
+# at 833
+#<date> server id 1  end_log_pos 898 	Write_rows: table id 30 flags: STMT_END_F
+### INSERT INTO `test`.`t1`
+### SET
+###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
+###   @2=1 /* INT meta=0 nullable=1 is_null=0 */
+###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
+###   @4=3 /* TINYINT meta=0 nullable=1 is_null=0 */
+###   @5=4 /* MEDIUMINT meta=0 nullable=1 is_null=0 */
+###   @6=5 /* LONGINT meta=0 nullable=1 is_null=0 */
+###   @7=6 /* INT meta=0 nullable=1 is_null=0 */
+###   @8=7 /* INT meta=0 nullable=1 is_null=0 */
+###   @9='' /* STRING(1) meta=65025 nullable=1 is_null=0 */
+# at 898
+#<date> server id 1  end_log_pos 967 	Query	thread_id=4	exec_time=0	error_code=0
+SET TIMESTAMP=X/*!*/;
+COMMIT
+/*!*/;
+# at 967
+#<date> server id 1  end_log_pos 1005 	GTID 0-1-4
+/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
+BEGIN
+/*!*/;
+# at 1005
+#<date> server id 1  end_log_pos 1057 	Table_map: `test`.`t1` mapped to number 30
+# at 1057
+#<date> server id 1  end_log_pos 1121 	Write_rows: table id 30 flags: STMT_END_F
+### INSERT INTO `test`.`t1`
+### SET
+###   @1=11 /* INT meta=0 nullable=0 is_null=0 */
+###   @2=1 /* INT meta=0 nullable=1 is_null=0 */
+###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
+###   @4=3 /* TINYINT meta=0 nullable=1 is_null=0 */
+###   @5=4 /* MEDIUMINT meta=0 nullable=1 is_null=0 */
+###   @6=5 /* LONGINT meta=0 nullable=1 is_null=0 */
+###   @7=6 /* INT meta=0 nullable=1 is_null=0 */
+###   @8=7 /* INT meta=0 nullable=1 is_null=0 */
+###   @9=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+# at 1121
+#<date> server id 1  end_log_pos 1190 	Query	thread_id=4	exec_time=0	error_code=0
+SET TIMESTAMP=X/*!*/;
+COMMIT
+/*!*/;
+# at 1190
+#<date> server id 1  end_log_pos 1228 	GTID 0-1-5
+/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
+BEGIN
+/*!*/;
+# at 1228
+#<date> server id 1  end_log_pos 1280 	Table_map: `test`.`t1` mapped to number 30
+# at 1280
+#<date> server id 1  end_log_pos 1343 	Write_rows: table id 30 flags: STMT_END_F
+### INSERT INTO `test`.`t1`
+### SET
+###   @1=12 /* INT meta=0 nullable=0 is_null=0 */
+###   @2=1 /* INT meta=0 nullable=1 is_null=0 */
+###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
+###   @4=3 /* TINYINT meta=0 nullable=1 is_null=0 */
+###   @5=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @6=5 /* LONGINT meta=0 nullable=1 is_null=0 */
+###   @7=6 /* INT meta=0 nullable=1 is_null=0 */
+###   @8=7 /* INT meta=0 nullable=1 is_null=0 */
+###   @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
+# at 1343
+#<date> server id 1  end_log_pos 1412 	Query	thread_id=4	exec_time=0	error_code=0
+SET TIMESTAMP=X/*!*/;
+COMMIT
+/*!*/;
+# at 1412
+#<date> server id 1  end_log_pos 1450 	GTID 0-1-6
+/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
+BEGIN
+/*!*/;
+# at 1450
+#<date> server id 1  end_log_pos 1502 	Table_map: `test`.`t1` mapped to number 30
+# at 1502
+#<date> server id 1  end_log_pos 1568 	Write_rows: table id 30 flags: STMT_END_F
+### INSERT INTO `test`.`t1`
+### SET
+###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
+###   @2=1 /* INT meta=0 nullable=1 is_null=0 */
+###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
+###   @4=3 /* TINYINT meta=0 nullable=1 is_null=0 */
+###   @5=0 /* MEDIUMINT meta=0 nullable=1 is_null=0 */
+###   @6=5 /* LONGINT meta=0 nullable=1 is_null=0 */
+###   @7=6 /* INT meta=0 nullable=1 is_null=0 */
+###   @8=7 /* INT meta=0 nullable=1 is_null=0 */
+###   @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
+# at 1568
+#<date> server id 1  end_log_pos 1637 	Query	thread_id=4	exec_time=0	error_code=0
+SET TIMESTAMP=X/*!*/;
+COMMIT
+/*!*/;
+# at 1637
+#<date> server id 1  end_log_pos 1675 	GTID 0-1-7
+/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
+BEGIN
+/*!*/;
+# at 1675
+#<date> server id 1  end_log_pos 1727 	Table_map: `test`.`t2` mapped to number 31
+# at 1727
+#<date> server id 1  end_log_pos 1890 	Write_rows: table id 31 flags: STMT_END_F
+### INSERT INTO `test`.`t2`
+### SET
+###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
+###   @2=1 /* INT meta=0 nullable=1 is_null=0 */
+###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
+###   @4=3 /* INT meta=0 nullable=1 is_null=0 */
+###   @5=4 /* INT meta=0 nullable=1 is_null=0 */
+###   @6=5 /* MEDIUMINT meta=0 nullable=1 is_null=0 */
+###   @7=6 /* INT meta=0 nullable=1 is_null=0 */
+###   @8=7 /* INT meta=0 nullable=1 is_null=0 */
+###   @9='' /* STRING(1) meta=65025 nullable=1 is_null=0 */
+### INSERT INTO `test`.`t2`
+### SET
+###   @1=11 /* INT meta=0 nullable=0 is_null=0 */
+###   @2=1 /* INT meta=0 nullable=1 is_null=0 */
+###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
+###   @4=3 /* INT meta=0 nullable=1 is_null=0 */
+###   @5=4 /* INT meta=0 nullable=1 is_null=0 */
+###   @6=5 /* MEDIUMINT meta=0 nullable=1 is_null=0 */
+###   @7=6 /* INT meta=0 nullable=1 is_null=0 */
+###   @8=7 /* INT meta=0 nullable=1 is_null=0 */
+###   @9=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+### INSERT INTO `test`.`t2`
+### SET
+###   @1=12 /* INT meta=0 nullable=0 is_null=0 */
+###   @2=1 /* INT meta=0 nullable=1 is_null=0 */
+###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
+###   @4=3 /* INT meta=0 nullable=1 is_null=0 */
+###   @5=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @6=5 /* MEDIUMINT meta=0 nullable=1 is_null=0 */
+###   @7=6 /* INT meta=0 nullable=1 is_null=0 */
+###   @8=7 /* INT meta=0 nullable=1 is_null=0 */
+###   @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
+### INSERT INTO `test`.`t2`
+### SET
+###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
+###   @2=1 /* INT meta=0 nullable=1 is_null=0 */
+###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
+###   @4=3 /* INT meta=0 nullable=1 is_null=0 */
+###   @5=0 /* INT meta=0 nullable=1 is_null=0 */
+###   @6=5 /* MEDIUMINT meta=0 nullable=1 is_null=0 */
+###   @7=6 /* INT meta=0 nullable=1 is_null=0 */
+###   @8=7 /* INT meta=0 nullable=1 is_null=0 */
+###   @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
+# at 1890
+#<date> server id 1  end_log_pos 1959 	Query	thread_id=4	exec_time=0	error_code=0
+SET TIMESTAMP=X/*!*/;
+COMMIT
+/*!*/;
+# at 1959
+#<date> server id 1  end_log_pos 1997 	GTID 0-1-8
+/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
+BEGIN
+/*!*/;
+# at 1997
+#<date> server id 1  end_log_pos 2049 	Table_map: `test`.`t2` mapped to number 31
+# at 2049
+#<date> server id 1  end_log_pos 2119 	Update_rows: table id 31 flags: STMT_END_F
+### UPDATE `test`.`t2`
+### WHERE
+###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
+###   @5=4 /* INT meta=0 nullable=1 is_null=0 */
+### SET
+###   @5=5 /* INT meta=0 nullable=1 is_null=0 */
+### UPDATE `test`.`t2`
+### WHERE
+###   @1=11 /* INT meta=0 nullable=0 is_null=0 */
+###   @5=4 /* INT meta=0 nullable=1 is_null=0 */
+### SET
+###   @5=5 /* INT meta=0 nullable=1 is_null=0 */
+### UPDATE `test`.`t2`
+### WHERE
+###   @1=12 /* INT meta=0 nullable=0 is_null=0 */
+###   @5=NULL /* INT meta=0 nullable=1 is_null=1 */
+### SET
+###   @5=5 /* INT meta=0 nullable=1 is_null=0 */
+# at 2119
+#<date> server id 1  end_log_pos 2188 	Query	thread_id=4	exec_time=0	error_code=0
+SET TIMESTAMP=X/*!*/;
+COMMIT
+/*!*/;
+# at 2188
+#<date> server id 1  end_log_pos 2226 	GTID 0-1-9
+/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
+BEGIN
+/*!*/;
+# at 2226
+#<date> server id 1  end_log_pos 2278 	Table_map: `test`.`t1` mapped to number 30
+# at 2278
+#<date> server id 1  end_log_pos 2328 	Delete_rows: table id 30 flags: STMT_END_F
+### DELETE FROM `test`.`t1`
+### WHERE
+###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
+### DELETE FROM `test`.`t1`
+### WHERE
+###   @1=11 /* INT meta=0 nullable=0 is_null=0 */
+### DELETE FROM `test`.`t1`
+### WHERE
+###   @1=12 /* INT meta=0 nullable=0 is_null=0 */
+### DELETE FROM `test`.`t1`
+### WHERE
+###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
+# at 2328
+#<date> server id 1  end_log_pos 2397 	Query	thread_id=4	exec_time=0	error_code=0
+SET TIMESTAMP=X/*!*/;
+COMMIT
+/*!*/;
+# at 2397
+#<date> server id 1  end_log_pos 2435 	GTID 0-1-10
+/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
+BEGIN
+/*!*/;
+# at 2435
+#<date> server id 1  end_log_pos 2487 	Table_map: `test`.`t2` mapped to number 31
+# at 2487
+#<date> server id 1  end_log_pos 2537 	Delete_rows: table id 31 flags: STMT_END_F
+### DELETE FROM `test`.`t2`
+### WHERE
+###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
+### DELETE FROM `test`.`t2`
+### WHERE
+###   @1=11 /* INT meta=0 nullable=0 is_null=0 */
+### DELETE FROM `test`.`t2`
+### WHERE
+###   @1=12 /* INT meta=0 nullable=0 is_null=0 */
+### DELETE FROM `test`.`t2`
+### WHERE
+###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
+# at 2537
+#<date> server id 1  end_log_pos 2606 	Query	thread_id=4	exec_time=0	error_code=0
+SET TIMESTAMP=X/*!*/;
+COMMIT
+/*!*/;
+# at 2606
+#<date> server id 1  end_log_pos 2650 	Rotate to master-bin.000002  pos: 4
+DELIMITER ;
+# End of log file
+ROLLBACK /* added by mysqlbinlog */;
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
+DROP TABLE t1,t2;
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
index a31825735fb..9a3f4751165 100644
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
@@ -377,8 +377,8 @@ CREATE TABLE t1 (c01 BIT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -394,8 +394,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -427,8 +427,8 @@ CREATE TABLE t1 (c01 BIT(7))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -444,8 +444,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -461,8 +461,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -478,8 +478,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -495,8 +495,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -512,8 +512,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -529,8 +529,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -546,8 +546,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -563,8 +563,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -580,8 +580,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -615,8 +615,8 @@ CREATE TABLE t1 (a BIT(20), b CHAR(2))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -649,8 +649,8 @@ CREATE TABLE t1 (c02 BIT(64))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -666,8 +666,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -683,8 +683,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -700,8 +700,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -733,8 +733,8 @@ CREATE TABLE t1 (c03 TINYINT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -756,8 +756,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -773,8 +773,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -792,8 +792,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -825,8 +825,8 @@ CREATE TABLE t1 (c04 TINYINT UNSIGNED)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -845,8 +845,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -878,8 +878,8 @@ CREATE TABLE t1 (c06 BOOL)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -895,8 +895,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -928,8 +928,8 @@ CREATE TABLE t1 (c07 SMALLINT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -945,8 +945,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -978,8 +978,8 @@ CREATE TABLE t1 (c08 SMALLINT UNSIGNED)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -998,8 +998,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -1017,8 +1017,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1050,8 +1050,8 @@ CREATE TABLE t1 (c10 MEDIUMINT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1067,8 +1067,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1100,8 +1100,8 @@ CREATE TABLE t1 (c11 MEDIUMINT UNSIGNED)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1120,8 +1120,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -1139,8 +1139,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1172,8 +1172,8 @@ CREATE TABLE t1 (c13 INT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1189,8 +1189,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1222,8 +1222,8 @@ CREATE TABLE t1 (c14 INT UNSIGNED)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1242,8 +1242,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -1261,8 +1261,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1294,8 +1294,8 @@ CREATE TABLE t1 (c16 BIGINT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1311,8 +1311,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1344,8 +1344,8 @@ CREATE TABLE t1 (c17 BIGINT UNSIGNED)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1364,8 +1364,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -1383,8 +1383,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1416,8 +1416,8 @@ CREATE TABLE t1 (c19 FLOAT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1433,8 +1433,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1466,8 +1466,8 @@ CREATE TABLE t1 (c22 DOUBLE)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1483,8 +1483,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1516,8 +1516,8 @@ CREATE TABLE t1 (c25 DECIMAL(10,5))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1533,8 +1533,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1550,8 +1550,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1583,8 +1583,8 @@ CREATE TABLE t1 (c28 DATE)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1600,8 +1600,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1633,8 +1633,8 @@ CREATE TABLE t1 (c29 DATETIME)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1650,8 +1650,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1683,8 +1683,8 @@ CREATE TABLE t1 (c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURR
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1701,8 +1701,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1734,8 +1734,8 @@ CREATE TABLE t1 (c31 TIME)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1751,8 +1751,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1784,8 +1784,8 @@ CREATE TABLE t1 (c32 YEAR)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1801,8 +1801,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1834,8 +1834,8 @@ CREATE TABLE t1 (c33 CHAR)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1851,8 +1851,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1884,8 +1884,8 @@ CREATE TABLE t1 (c34 CHAR(0))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1901,8 +1901,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1934,8 +1934,8 @@ CREATE TABLE t1 (c35 CHAR(1))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -1951,8 +1951,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -1984,8 +1984,8 @@ CREATE TABLE t1 (c36 CHAR(255))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2001,8 +2001,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2034,8 +2034,8 @@ CREATE TABLE t1 (c37 NATIONAL CHAR)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2051,8 +2051,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2084,8 +2084,8 @@ CREATE TABLE t1 (c38 NATIONAL CHAR(0))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2101,8 +2101,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2134,8 +2134,8 @@ CREATE TABLE t1 (c39 NATIONAL CHAR(1))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2151,8 +2151,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2184,8 +2184,8 @@ CREATE TABLE t1 (c40 NATIONAL CHAR(255))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2201,8 +2201,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2218,8 +2218,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2254,8 +2254,8 @@ CREATE TABLE t1 (c41 CHAR CHARACTER SET UCS2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2271,8 +2271,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2304,8 +2304,8 @@ CREATE TABLE t1 (c42 CHAR(0) CHARACTER SET UCS2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2321,8 +2321,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2354,8 +2354,8 @@ CREATE TABLE t1 (c43 CHAR(1) CHARACTER SET UCS2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2371,8 +2371,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2404,8 +2404,8 @@ CREATE TABLE t1 (c44 CHAR(255) CHARACTER SET UCS2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2421,8 +2421,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2438,9 +2438,9 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
@@ -2476,8 +2476,8 @@ CREATE TABLE t1 (c45 VARCHAR(0))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2493,8 +2493,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2526,8 +2526,8 @@ CREATE TABLE t1 (c46 VARCHAR(1))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2543,8 +2543,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2576,8 +2576,8 @@ CREATE TABLE t1 (c47 VARCHAR(255))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2593,8 +2593,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2626,8 +2626,8 @@ CREATE TABLE t1 (c48 VARCHAR(261))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2643,8 +2643,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2676,8 +2676,8 @@ CREATE TABLE t1 (c49 NATIONAL VARCHAR(0))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2693,8 +2693,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2726,8 +2726,8 @@ CREATE TABLE t1 (c50 NATIONAL VARCHAR(1))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2743,8 +2743,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2776,8 +2776,8 @@ CREATE TABLE t1 (c51 NATIONAL VARCHAR(255))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2793,8 +2793,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2810,8 +2810,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2846,8 +2846,8 @@ CREATE TABLE t1 (c52 NATIONAL VARCHAR(261))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2863,8 +2863,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2880,8 +2880,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2916,8 +2916,8 @@ CREATE TABLE t1 (c53 VARCHAR(0) CHARACTER SET ucs2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2933,8 +2933,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -2966,8 +2966,8 @@ CREATE TABLE t1 (c54 VARCHAR(1) CHARACTER SET ucs2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2983,8 +2983,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3016,8 +3016,8 @@ CREATE TABLE t1 (c55 VARCHAR(255) CHARACTER SET ucs2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3033,8 +3033,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3066,8 +3066,8 @@ CREATE TABLE t1 (c56 VARCHAR(261) CHARACTER SET ucs2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3083,8 +3083,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3116,8 +3116,8 @@ CREATE TABLE t1 (c57 BINARY)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3133,8 +3133,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3150,8 +3150,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3167,8 +3167,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3200,8 +3200,8 @@ CREATE TABLE t1 (c58 BINARY(0))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3217,8 +3217,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3250,8 +3250,8 @@ CREATE TABLE t1 (c59 BINARY(1))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3267,8 +3267,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3284,8 +3284,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3301,8 +3301,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3334,8 +3334,8 @@ CREATE TABLE t1 (c60 BINARY(255))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3351,8 +3351,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3368,8 +3368,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3385,8 +3385,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3418,8 +3418,8 @@ CREATE TABLE t1 (c61 VARBINARY(0))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3435,8 +3435,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3468,8 +3468,8 @@ CREATE TABLE t1 (c62 VARBINARY(1))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3485,8 +3485,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3502,8 +3502,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3519,8 +3519,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3552,8 +3552,8 @@ CREATE TABLE t1 (c63 VARBINARY(255))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3569,8 +3569,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3586,8 +3586,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3603,8 +3603,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3636,8 +3636,8 @@ CREATE TABLE t1 (c65 TINYBLOB)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3653,8 +3653,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3686,8 +3686,8 @@ CREATE TABLE t1 (c68 BLOB)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3703,8 +3703,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3736,8 +3736,8 @@ CREATE TABLE t1 (c71 MEDIUMBLOB)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3753,8 +3753,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3786,8 +3786,8 @@ CREATE TABLE t1 (c74 LONGBLOB)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3803,8 +3803,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3836,8 +3836,8 @@ CREATE TABLE t1 (c66 TINYTEXT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3853,8 +3853,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3886,8 +3886,8 @@ CREATE TABLE t1 (c69 TEXT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3903,8 +3903,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3936,8 +3936,8 @@ CREATE TABLE t1 (c72 MEDIUMTEXT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3953,8 +3953,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3986,8 +3986,8 @@ CREATE TABLE t1 (c75 LONGTEXT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4003,8 +4003,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -4036,8 +4036,8 @@ CREATE TABLE t1 (c67 TINYTEXT CHARACTER SET UCS2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4053,8 +4053,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -4086,8 +4086,8 @@ CREATE TABLE t1 (c70 TEXT CHARACTER SET UCS2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4103,8 +4103,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -4136,8 +4136,8 @@ CREATE TABLE t1 (c73 MEDIUMTEXT CHARACTER SET UCS2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4153,8 +4153,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -4186,8 +4186,8 @@ CREATE TABLE t1 (c76 LONGTEXT CHARACTER SET UCS2)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4203,8 +4203,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -4236,8 +4236,8 @@ CREATE TABLE t1 (c77 ENUM('a','b','c'))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4253,8 +4253,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -4286,8 +4286,8 @@ CREATE TABLE t1 (c78 SET('a','b','c','d','e','f'))
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4303,8 +4303,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4320,8 +4320,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4337,8 +4337,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4354,8 +4354,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4371,8 +4371,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4388,8 +4388,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4405,8 +4405,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -4446,8 +4446,8 @@ CREATE TABLE t2 (a int NOT NULL DEFAULT 0, b int NOT NULL DEFAULT 0)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4464,8 +4464,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4482,8 +4482,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
@@ -4500,8 +4500,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
@@ -4518,11 +4518,11 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
@@ -4572,8 +4572,8 @@ DROP TABLE `t1`,`t2` /* generated by server */
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1dec102` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1dec102`
 ### SET
@@ -4588,8 +4588,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1dec102` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1dec102`
 ### SET
@@ -4604,8 +4604,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1dec102` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1dec102`
 ### SET
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
index cf90289c7ca..13c1ba62231 100644
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
@@ -2371,8 +2371,8 @@ crn INT -- row number
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2464,8 +2464,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2557,91 +2557,91 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
-###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
-###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
-###   @3=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @4=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @5=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @6=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @7=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @8=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @9=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @10=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @11=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @12=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @13=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @14=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @15=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @16=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @17=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @18=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @19=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @20=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @21=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @22=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @23=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @24=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @25=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @26=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @27=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @28=NULL /* type=14 meta=0 nullable=1 is_null=1 */
-###   @29=NULL /* type=18 meta=0 nullable=1 is_null=1 */
+###   @1=NULL /* BIT(1) meta=1 nullable=1 is_null=1 */
+###   @2=NULL /* BIT(64) meta=2048 nullable=1 is_null=1 */
+###   @3=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @4=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @5=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @6=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @7=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @8=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @9=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @10=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @11=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @12=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @13=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @14=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @15=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @16=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @17=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @18=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @19=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @20=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @21=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @22=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @23=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @24=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @25=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @26=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @27=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @28=NULL /* DATE meta=0 nullable=1 is_null=1 */
+###   @29=NULL /* DATETIME(0) meta=0 nullable=1 is_null=1 */
 ###   @30=1000000000 /* TIMESTAMP(0) meta=0 nullable=0 is_null=0 */
-###   @31=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @32=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @33=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @34=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @35=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @36=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @37=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @38=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @39=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @40=NULL /* TIMESTAMP(0) meta=57085 nullable=1 is_null=1 */
-###   @41=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @42=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @43=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @44=NULL /* TIMESTAMP(0) meta=61182 nullable=1 is_null=1 */
-###   @45=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @46=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @47=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @48=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @49=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @50=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @51=NULL /* TIMESTAMP(0) meta=765 nullable=1 is_null=1 */
-###   @52=NULL /* TIMESTAMP(0) meta=783 nullable=1 is_null=1 */
-###   @53=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @54=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @55=NULL /* TIMESTAMP(0) meta=510 nullable=1 is_null=1 */
-###   @56=NULL /* TIMESTAMP(0) meta=522 nullable=1 is_null=1 */
-###   @57=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @58=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @59=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @60=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @61=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @62=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @63=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @64=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @65=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @66=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @67=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @68=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @69=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @70=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @71=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @72=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @73=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @74=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @75=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @76=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @77=NULL /* TIMESTAMP(0) meta=63233 nullable=1 is_null=1 */
-###   @78=NULL /* TIMESTAMP(0) meta=63489 nullable=1 is_null=1 */
+###   @31=NULL /* TIME(0) meta=0 nullable=1 is_null=1 */
+###   @32=NULL /* YEAR meta=0 nullable=1 is_null=1 */
+###   @33=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @34=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @35=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @36=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @37=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @38=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @39=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @40=NULL /* STRING(765) meta=57085 nullable=1 is_null=1 */
+###   @41=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @42=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @43=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @44=NULL /* STRING(510) meta=61182 nullable=1 is_null=1 */
+###   @45=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @46=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @47=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @48=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @49=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @50=NULL /* VARSTRING(3) meta=3 nullable=1 is_null=1 */
+###   @51=NULL /* VARSTRING(765) meta=765 nullable=1 is_null=1 */
+###   @52=NULL /* VARSTRING(783) meta=783 nullable=1 is_null=1 */
+###   @53=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @54=NULL /* VARSTRING(2) meta=2 nullable=1 is_null=1 */
+###   @55=NULL /* VARSTRING(510) meta=510 nullable=1 is_null=1 */
+###   @56=NULL /* VARSTRING(522) meta=522 nullable=1 is_null=1 */
+###   @57=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @58=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @59=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @60=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @61=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @62=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @63=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @64=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @65=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @66=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @67=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @68=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @69=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @70=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @71=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @72=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @73=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @74=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @75=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @76=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
+###   @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
 ###   @79=3 /* INT meta=0 nullable=1 is_null=0 */
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2733,8 +2733,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -2906,8 +2906,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -3079,89 +3079,89 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
-###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
-###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
-###   @3=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @4=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @5=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @6=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @7=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @8=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @9=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @10=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @11=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @12=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @13=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @14=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @15=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @16=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @17=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @18=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @19=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @20=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @21=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @22=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @23=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @24=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @25=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @26=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @27=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @28=NULL /* type=14 meta=0 nullable=1 is_null=1 */
-###   @29=NULL /* type=18 meta=0 nullable=1 is_null=1 */
+###   @1=NULL /* BIT(1) meta=1 nullable=1 is_null=1 */
+###   @2=NULL /* BIT(64) meta=2048 nullable=1 is_null=1 */
+###   @3=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @4=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @5=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @6=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @7=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @8=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @9=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @10=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @11=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @12=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @13=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @14=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @15=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @16=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @17=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @18=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @19=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @20=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @21=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @22=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @23=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @24=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @25=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @26=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @27=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @28=NULL /* DATE meta=0 nullable=1 is_null=1 */
+###   @29=NULL /* DATETIME(0) meta=0 nullable=1 is_null=1 */
 ###   @30=1000000000 /* TIMESTAMP(0) meta=0 nullable=0 is_null=0 */
-###   @31=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @32=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @33=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @34=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @35=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @36=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @37=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @38=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @39=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @40=NULL /* TIMESTAMP(0) meta=57085 nullable=1 is_null=1 */
-###   @41=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @42=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @43=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @44=NULL /* TIMESTAMP(0) meta=61182 nullable=1 is_null=1 */
-###   @45=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @46=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @47=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @48=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @49=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @50=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @51=NULL /* TIMESTAMP(0) meta=765 nullable=1 is_null=1 */
-###   @52=NULL /* TIMESTAMP(0) meta=783 nullable=1 is_null=1 */
-###   @53=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @54=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @55=NULL /* TIMESTAMP(0) meta=510 nullable=1 is_null=1 */
-###   @56=NULL /* TIMESTAMP(0) meta=522 nullable=1 is_null=1 */
-###   @57=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @58=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @59=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @60=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @61=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @62=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @63=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @64=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @65=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @66=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @67=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @68=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @69=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @70=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @71=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @72=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @73=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @74=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @75=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @76=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @77=NULL /* TIMESTAMP(0) meta=63233 nullable=1 is_null=1 */
-###   @78=NULL /* TIMESTAMP(0) meta=63489 nullable=1 is_null=1 */
+###   @31=NULL /* TIME(0) meta=0 nullable=1 is_null=1 */
+###   @32=NULL /* YEAR meta=0 nullable=1 is_null=1 */
+###   @33=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @34=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @35=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @36=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @37=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @38=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @39=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @40=NULL /* STRING(765) meta=57085 nullable=1 is_null=1 */
+###   @41=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @42=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @43=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @44=NULL /* STRING(510) meta=61182 nullable=1 is_null=1 */
+###   @45=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @46=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @47=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @48=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @49=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @50=NULL /* VARSTRING(3) meta=3 nullable=1 is_null=1 */
+###   @51=NULL /* VARSTRING(765) meta=765 nullable=1 is_null=1 */
+###   @52=NULL /* VARSTRING(783) meta=783 nullable=1 is_null=1 */
+###   @53=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @54=NULL /* VARSTRING(2) meta=2 nullable=1 is_null=1 */
+###   @55=NULL /* VARSTRING(510) meta=510 nullable=1 is_null=1 */
+###   @56=NULL /* VARSTRING(522) meta=522 nullable=1 is_null=1 */
+###   @57=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @58=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @59=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @60=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @61=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @62=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @63=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @64=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @65=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @66=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @67=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @68=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @69=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @70=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @71=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @72=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @73=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @74=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @75=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @76=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
+###   @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
 ###   @79=3 /* INT meta=0 nullable=1 is_null=0 */
 ### SET
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
@@ -3252,8 +3252,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -3337,84 +3337,84 @@ BEGIN
 ###   @78=b'00000110' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
 ###   @79=4 /* INT meta=0 nullable=1 is_null=0 */
 ### SET
-###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
-###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
-###   @3=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @4=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @5=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @6=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @7=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @8=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @9=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @10=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @11=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @12=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @13=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @14=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @15=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @16=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @17=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @18=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @19=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @20=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @21=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @22=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @23=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @24=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @25=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @26=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @27=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @28=NULL /* type=14 meta=0 nullable=1 is_null=1 */
-###   @29=NULL /* type=18 meta=0 nullable=1 is_null=1 */
+###   @1=NULL /* BIT(1) meta=1 nullable=1 is_null=1 */
+###   @2=NULL /* BIT(64) meta=2048 nullable=1 is_null=1 */
+###   @3=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @4=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @5=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @6=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @7=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @8=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @9=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @10=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @11=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @12=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @13=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @14=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @15=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @16=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @17=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @18=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @19=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @20=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @21=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @22=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @23=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @24=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @25=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @26=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @27=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @28=NULL /* DATE meta=0 nullable=1 is_null=1 */
+###   @29=NULL /* DATETIME(0) meta=0 nullable=1 is_null=1 */
 ###   @30=1000000000 /* TIMESTAMP(0) meta=0 nullable=0 is_null=0 */
-###   @31=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @32=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @33=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @34=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @35=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @36=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @37=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @38=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @39=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @40=NULL /* TIMESTAMP(0) meta=57085 nullable=1 is_null=1 */
-###   @41=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @42=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @43=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @44=NULL /* TIMESTAMP(0) meta=61182 nullable=1 is_null=1 */
-###   @45=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @46=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @47=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @48=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @49=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @50=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @51=NULL /* TIMESTAMP(0) meta=765 nullable=1 is_null=1 */
-###   @52=NULL /* TIMESTAMP(0) meta=783 nullable=1 is_null=1 */
-###   @53=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @54=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @55=NULL /* TIMESTAMP(0) meta=510 nullable=1 is_null=1 */
-###   @56=NULL /* TIMESTAMP(0) meta=522 nullable=1 is_null=1 */
-###   @57=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @58=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @59=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @60=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @61=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @62=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @63=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @64=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @65=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @66=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @67=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @68=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @69=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @70=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @71=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @72=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @73=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @74=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @75=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @76=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @77=NULL /* TIMESTAMP(0) meta=63233 nullable=1 is_null=1 */
-###   @78=NULL /* TIMESTAMP(0) meta=63489 nullable=1 is_null=1 */
+###   @31=NULL /* TIME(0) meta=0 nullable=1 is_null=1 */
+###   @32=NULL /* YEAR meta=0 nullable=1 is_null=1 */
+###   @33=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @34=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @35=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @36=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @37=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @38=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @39=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @40=NULL /* STRING(765) meta=57085 nullable=1 is_null=1 */
+###   @41=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @42=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @43=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @44=NULL /* STRING(510) meta=61182 nullable=1 is_null=1 */
+###   @45=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @46=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @47=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @48=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @49=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @50=NULL /* VARSTRING(3) meta=3 nullable=1 is_null=1 */
+###   @51=NULL /* VARSTRING(765) meta=765 nullable=1 is_null=1 */
+###   @52=NULL /* VARSTRING(783) meta=783 nullable=1 is_null=1 */
+###   @53=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @54=NULL /* VARSTRING(2) meta=2 nullable=1 is_null=1 */
+###   @55=NULL /* VARSTRING(510) meta=510 nullable=1 is_null=1 */
+###   @56=NULL /* VARSTRING(522) meta=522 nullable=1 is_null=1 */
+###   @57=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @58=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @59=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @60=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @61=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @62=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @63=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @64=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @65=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @66=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @67=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @68=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @69=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @70=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @71=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @72=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @73=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @74=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @75=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @76=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
+###   @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
 ###   @79=4 /* INT meta=0 nullable=1 is_null=0 */
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Xid = #
@@ -3425,8 +3425,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3518,8 +3518,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3611,8 +3611,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3704,89 +3704,89 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
-###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
-###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
-###   @3=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @4=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @5=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @6=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @7=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @8=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @9=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @10=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @11=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @12=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @13=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @14=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @15=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @16=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @17=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @18=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @19=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @20=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @21=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @22=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @23=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @24=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @25=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @26=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @27=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @28=NULL /* type=14 meta=0 nullable=1 is_null=1 */
-###   @29=NULL /* type=18 meta=0 nullable=1 is_null=1 */
+###   @1=NULL /* BIT(1) meta=1 nullable=1 is_null=1 */
+###   @2=NULL /* BIT(64) meta=2048 nullable=1 is_null=1 */
+###   @3=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @4=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @5=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @6=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @7=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @8=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @9=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @10=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @11=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @12=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @13=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @14=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @15=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @16=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @17=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @18=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @19=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @20=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @21=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @22=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @23=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @24=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @25=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @26=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @27=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @28=NULL /* DATE meta=0 nullable=1 is_null=1 */
+###   @29=NULL /* DATETIME(0) meta=0 nullable=1 is_null=1 */
 ###   @30=1000000000 /* TIMESTAMP(0) meta=0 nullable=0 is_null=0 */
-###   @31=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @32=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @33=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @34=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @35=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @36=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @37=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @38=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @39=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @40=NULL /* TIMESTAMP(0) meta=57085 nullable=1 is_null=1 */
-###   @41=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @42=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @43=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @44=NULL /* TIMESTAMP(0) meta=61182 nullable=1 is_null=1 */
-###   @45=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @46=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @47=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @48=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @49=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @50=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @51=NULL /* TIMESTAMP(0) meta=765 nullable=1 is_null=1 */
-###   @52=NULL /* TIMESTAMP(0) meta=783 nullable=1 is_null=1 */
-###   @53=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @54=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @55=NULL /* TIMESTAMP(0) meta=510 nullable=1 is_null=1 */
-###   @56=NULL /* TIMESTAMP(0) meta=522 nullable=1 is_null=1 */
-###   @57=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @58=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @59=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @60=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @61=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @62=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @63=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @64=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @65=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @66=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @67=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @68=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @69=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @70=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @71=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @72=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @73=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @74=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @75=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @76=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @77=NULL /* TIMESTAMP(0) meta=63233 nullable=1 is_null=1 */
-###   @78=NULL /* TIMESTAMP(0) meta=63489 nullable=1 is_null=1 */
+###   @31=NULL /* TIME(0) meta=0 nullable=1 is_null=1 */
+###   @32=NULL /* YEAR meta=0 nullable=1 is_null=1 */
+###   @33=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @34=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @35=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @36=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @37=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @38=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @39=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @40=NULL /* STRING(765) meta=57085 nullable=1 is_null=1 */
+###   @41=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @42=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @43=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @44=NULL /* STRING(510) meta=61182 nullable=1 is_null=1 */
+###   @45=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @46=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @47=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @48=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @49=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @50=NULL /* VARSTRING(3) meta=3 nullable=1 is_null=1 */
+###   @51=NULL /* VARSTRING(765) meta=765 nullable=1 is_null=1 */
+###   @52=NULL /* VARSTRING(783) meta=783 nullable=1 is_null=1 */
+###   @53=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @54=NULL /* VARSTRING(2) meta=2 nullable=1 is_null=1 */
+###   @55=NULL /* VARSTRING(510) meta=510 nullable=1 is_null=1 */
+###   @56=NULL /* VARSTRING(522) meta=522 nullable=1 is_null=1 */
+###   @57=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @58=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @59=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @60=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @61=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @62=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @63=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @64=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @65=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @66=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @67=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @68=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @69=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @70=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @71=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @72=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @73=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @74=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @75=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @76=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
+###   @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
 ###   @79=4 /* INT meta=0 nullable=1 is_null=0 */
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Xid = #
@@ -3921,8 +3921,8 @@ crn INT -- row number
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -3978,8 +3978,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -4053,8 +4053,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -4324,8 +4324,8 @@ c_3_n INT -- row number
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4381,8 +4381,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
@@ -4438,8 +4438,8 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t3`
 ### SET
@@ -4495,14 +4495,14 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 # at #
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
@@ -4677,14 +4677,14 @@ COMMIT/*!*/;
 BEGIN
 /*!*/;
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 # at #
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
@@ -4886,8 +4886,8 @@ c3 VARCHAR(60)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
index 4d7cc8e9751..e2600c9953c 100644
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
@@ -2371,8 +2371,8 @@ crn INT -- row number
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2467,8 +2467,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2562,91 +2562,91 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
-###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
-###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
-###   @3=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @4=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @5=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @6=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @7=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @8=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @9=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @10=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @11=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @12=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @13=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @14=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @15=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @16=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @17=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @18=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @19=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @20=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @21=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @22=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @23=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @24=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @25=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @26=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @27=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @28=NULL /* type=14 meta=0 nullable=1 is_null=1 */
-###   @29=NULL /* type=18 meta=0 nullable=1 is_null=1 */
+###   @1=NULL /* BIT(1) meta=1 nullable=1 is_null=1 */
+###   @2=NULL /* BIT(64) meta=2048 nullable=1 is_null=1 */
+###   @3=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @4=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @5=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @6=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @7=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @8=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @9=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @10=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @11=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @12=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @13=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @14=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @15=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @16=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @17=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @18=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @19=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @20=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @21=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @22=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @23=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @24=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @25=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @26=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @27=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @28=NULL /* DATE meta=0 nullable=1 is_null=1 */
+###   @29=NULL /* DATETIME(0) meta=0 nullable=1 is_null=1 */
 ###   @30=1000000000 /* TIMESTAMP(0) meta=0 nullable=0 is_null=0 */
-###   @31=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @32=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @33=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @34=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @35=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @36=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @37=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @38=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @39=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @40=NULL /* TIMESTAMP(0) meta=57085 nullable=1 is_null=1 */
-###   @41=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @42=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @43=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @44=NULL /* TIMESTAMP(0) meta=61182 nullable=1 is_null=1 */
-###   @45=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @46=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @47=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @48=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @49=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @50=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @51=NULL /* TIMESTAMP(0) meta=765 nullable=1 is_null=1 */
-###   @52=NULL /* TIMESTAMP(0) meta=783 nullable=1 is_null=1 */
-###   @53=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @54=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @55=NULL /* TIMESTAMP(0) meta=510 nullable=1 is_null=1 */
-###   @56=NULL /* TIMESTAMP(0) meta=522 nullable=1 is_null=1 */
-###   @57=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @58=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @59=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @60=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @61=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @62=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @63=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @64=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @65=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @66=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @67=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @68=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @69=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @70=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @71=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @72=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @73=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @74=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @75=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @76=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @77=NULL /* TIMESTAMP(0) meta=63233 nullable=1 is_null=1 */
-###   @78=NULL /* TIMESTAMP(0) meta=63489 nullable=1 is_null=1 */
+###   @31=NULL /* TIME(0) meta=0 nullable=1 is_null=1 */
+###   @32=NULL /* YEAR meta=0 nullable=1 is_null=1 */
+###   @33=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @34=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @35=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @36=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @37=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @38=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @39=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @40=NULL /* STRING(765) meta=57085 nullable=1 is_null=1 */
+###   @41=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @42=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @43=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @44=NULL /* STRING(510) meta=61182 nullable=1 is_null=1 */
+###   @45=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @46=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @47=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @48=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @49=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @50=NULL /* VARSTRING(3) meta=3 nullable=1 is_null=1 */
+###   @51=NULL /* VARSTRING(765) meta=765 nullable=1 is_null=1 */
+###   @52=NULL /* VARSTRING(783) meta=783 nullable=1 is_null=1 */
+###   @53=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @54=NULL /* VARSTRING(2) meta=2 nullable=1 is_null=1 */
+###   @55=NULL /* VARSTRING(510) meta=510 nullable=1 is_null=1 */
+###   @56=NULL /* VARSTRING(522) meta=522 nullable=1 is_null=1 */
+###   @57=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @58=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @59=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @60=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @61=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @62=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @63=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @64=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @65=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @66=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @67=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @68=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @69=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @70=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @71=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @72=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @73=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @74=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @75=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @76=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
+###   @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
 ###   @79=3 /* INT meta=0 nullable=1 is_null=0 */
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -2740,8 +2740,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -2915,8 +2915,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -3090,89 +3090,89 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
-###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
-###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
-###   @3=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @4=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @5=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @6=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @7=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @8=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @9=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @10=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @11=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @12=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @13=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @14=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @15=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @16=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @17=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @18=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @19=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @20=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @21=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @22=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @23=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @24=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @25=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @26=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @27=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @28=NULL /* type=14 meta=0 nullable=1 is_null=1 */
-###   @29=NULL /* type=18 meta=0 nullable=1 is_null=1 */
+###   @1=NULL /* BIT(1) meta=1 nullable=1 is_null=1 */
+###   @2=NULL /* BIT(64) meta=2048 nullable=1 is_null=1 */
+###   @3=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @4=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @5=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @6=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @7=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @8=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @9=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @10=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @11=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @12=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @13=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @14=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @15=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @16=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @17=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @18=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @19=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @20=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @21=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @22=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @23=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @24=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @25=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @26=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @27=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @28=NULL /* DATE meta=0 nullable=1 is_null=1 */
+###   @29=NULL /* DATETIME(0) meta=0 nullable=1 is_null=1 */
 ###   @30=1000000000 /* TIMESTAMP(0) meta=0 nullable=0 is_null=0 */
-###   @31=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @32=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @33=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @34=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @35=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @36=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @37=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @38=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @39=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @40=NULL /* TIMESTAMP(0) meta=57085 nullable=1 is_null=1 */
-###   @41=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @42=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @43=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @44=NULL /* TIMESTAMP(0) meta=61182 nullable=1 is_null=1 */
-###   @45=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @46=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @47=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @48=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @49=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @50=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @51=NULL /* TIMESTAMP(0) meta=765 nullable=1 is_null=1 */
-###   @52=NULL /* TIMESTAMP(0) meta=783 nullable=1 is_null=1 */
-###   @53=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @54=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @55=NULL /* TIMESTAMP(0) meta=510 nullable=1 is_null=1 */
-###   @56=NULL /* TIMESTAMP(0) meta=522 nullable=1 is_null=1 */
-###   @57=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @58=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @59=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @60=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @61=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @62=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @63=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @64=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @65=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @66=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @67=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @68=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @69=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @70=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @71=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @72=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @73=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @74=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @75=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @76=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @77=NULL /* TIMESTAMP(0) meta=63233 nullable=1 is_null=1 */
-###   @78=NULL /* TIMESTAMP(0) meta=63489 nullable=1 is_null=1 */
+###   @31=NULL /* TIME(0) meta=0 nullable=1 is_null=1 */
+###   @32=NULL /* YEAR meta=0 nullable=1 is_null=1 */
+###   @33=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @34=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @35=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @36=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @37=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @38=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @39=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @40=NULL /* STRING(765) meta=57085 nullable=1 is_null=1 */
+###   @41=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @42=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @43=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @44=NULL /* STRING(510) meta=61182 nullable=1 is_null=1 */
+###   @45=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @46=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @47=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @48=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @49=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @50=NULL /* VARSTRING(3) meta=3 nullable=1 is_null=1 */
+###   @51=NULL /* VARSTRING(765) meta=765 nullable=1 is_null=1 */
+###   @52=NULL /* VARSTRING(783) meta=783 nullable=1 is_null=1 */
+###   @53=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @54=NULL /* VARSTRING(2) meta=2 nullable=1 is_null=1 */
+###   @55=NULL /* VARSTRING(510) meta=510 nullable=1 is_null=1 */
+###   @56=NULL /* VARSTRING(522) meta=522 nullable=1 is_null=1 */
+###   @57=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @58=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @59=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @60=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @61=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @62=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @63=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @64=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @65=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @66=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @67=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @68=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @69=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @70=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @71=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @72=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @73=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @74=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @75=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @76=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
+###   @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
 ###   @79=3 /* INT meta=0 nullable=1 is_null=0 */
 ### SET
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
@@ -3265,8 +3265,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -3350,84 +3350,84 @@ BEGIN
 ###   @78=b'00000110' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
 ###   @79=4 /* INT meta=0 nullable=1 is_null=0 */
 ### SET
-###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
-###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
-###   @3=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @4=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @5=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @6=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @7=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @8=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @9=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @10=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @11=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @12=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @13=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @14=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @15=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @16=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @17=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @18=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @19=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @20=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @21=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @22=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @23=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @24=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @25=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @26=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @27=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @28=NULL /* type=14 meta=0 nullable=1 is_null=1 */
-###   @29=NULL /* type=18 meta=0 nullable=1 is_null=1 */
+###   @1=NULL /* BIT(1) meta=1 nullable=1 is_null=1 */
+###   @2=NULL /* BIT(64) meta=2048 nullable=1 is_null=1 */
+###   @3=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @4=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @5=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @6=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @7=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @8=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @9=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @10=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @11=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @12=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @13=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @14=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @15=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @16=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @17=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @18=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @19=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @20=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @21=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @22=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @23=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @24=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @25=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @26=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @27=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @28=NULL /* DATE meta=0 nullable=1 is_null=1 */
+###   @29=NULL /* DATETIME(0) meta=0 nullable=1 is_null=1 */
 ###   @30=1000000000 /* TIMESTAMP(0) meta=0 nullable=0 is_null=0 */
-###   @31=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @32=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @33=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @34=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @35=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @36=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @37=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @38=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @39=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @40=NULL /* TIMESTAMP(0) meta=57085 nullable=1 is_null=1 */
-###   @41=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @42=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @43=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @44=NULL /* TIMESTAMP(0) meta=61182 nullable=1 is_null=1 */
-###   @45=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @46=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @47=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @48=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @49=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @50=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @51=NULL /* TIMESTAMP(0) meta=765 nullable=1 is_null=1 */
-###   @52=NULL /* TIMESTAMP(0) meta=783 nullable=1 is_null=1 */
-###   @53=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @54=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @55=NULL /* TIMESTAMP(0) meta=510 nullable=1 is_null=1 */
-###   @56=NULL /* TIMESTAMP(0) meta=522 nullable=1 is_null=1 */
-###   @57=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @58=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @59=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @60=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @61=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @62=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @63=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @64=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @65=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @66=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @67=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @68=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @69=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @70=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @71=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @72=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @73=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @74=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @75=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @76=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @77=NULL /* TIMESTAMP(0) meta=63233 nullable=1 is_null=1 */
-###   @78=NULL /* TIMESTAMP(0) meta=63489 nullable=1 is_null=1 */
+###   @31=NULL /* TIME(0) meta=0 nullable=1 is_null=1 */
+###   @32=NULL /* YEAR meta=0 nullable=1 is_null=1 */
+###   @33=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @34=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @35=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @36=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @37=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @38=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @39=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @40=NULL /* STRING(765) meta=57085 nullable=1 is_null=1 */
+###   @41=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @42=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @43=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @44=NULL /* STRING(510) meta=61182 nullable=1 is_null=1 */
+###   @45=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @46=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @47=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @48=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @49=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @50=NULL /* VARSTRING(3) meta=3 nullable=1 is_null=1 */
+###   @51=NULL /* VARSTRING(765) meta=765 nullable=1 is_null=1 */
+###   @52=NULL /* VARSTRING(783) meta=783 nullable=1 is_null=1 */
+###   @53=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @54=NULL /* VARSTRING(2) meta=2 nullable=1 is_null=1 */
+###   @55=NULL /* VARSTRING(510) meta=510 nullable=1 is_null=1 */
+###   @56=NULL /* VARSTRING(522) meta=522 nullable=1 is_null=1 */
+###   @57=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @58=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @59=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @60=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @61=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @62=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @63=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @64=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @65=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @66=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @67=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @68=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @69=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @70=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @71=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @72=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @73=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @74=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @75=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @76=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
+###   @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
 ###   @79=4 /* INT meta=0 nullable=1 is_null=0 */
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
@@ -3440,8 +3440,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3535,8 +3535,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3630,8 +3630,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -3725,89 +3725,89 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
-###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
-###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
-###   @3=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @4=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @5=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @6=NULL /* type=1 meta=0 nullable=1 is_null=1 */
-###   @7=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @8=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @9=NULL /* type=2 meta=0 nullable=1 is_null=1 */
-###   @10=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @11=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @12=NULL /* type=9 meta=0 nullable=1 is_null=1 */
-###   @13=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @14=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @15=NULL /* type=3 meta=0 nullable=1 is_null=1 */
-###   @16=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @17=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @18=NULL /* type=8 meta=0 nullable=1 is_null=1 */
-###   @19=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @20=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @21=NULL /* type=4 meta=4 nullable=1 is_null=1 */
-###   @22=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @23=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @24=NULL /* type=5 meta=8 nullable=1 is_null=1 */
-###   @25=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @26=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @27=NULL /* type=246 meta=2560 nullable=1 is_null=1 */
-###   @28=NULL /* type=14 meta=0 nullable=1 is_null=1 */
-###   @29=NULL /* type=18 meta=0 nullable=1 is_null=1 */
+###   @1=NULL /* BIT(1) meta=1 nullable=1 is_null=1 */
+###   @2=NULL /* BIT(64) meta=2048 nullable=1 is_null=1 */
+###   @3=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @4=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @5=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @6=NULL /* TINYINT meta=0 nullable=1 is_null=1 */
+###   @7=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @8=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @9=NULL /* SHORTINT meta=0 nullable=1 is_null=1 */
+###   @10=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @11=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @12=NULL /* MEDIUMINT meta=0 nullable=1 is_null=1 */
+###   @13=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @14=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @15=NULL /* INT meta=0 nullable=1 is_null=1 */
+###   @16=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @17=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @18=NULL /* LONGINT meta=0 nullable=1 is_null=1 */
+###   @19=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @20=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @21=NULL /* FLOAT meta=4 nullable=1 is_null=1 */
+###   @22=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @23=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @24=NULL /* DOUBLE meta=8 nullable=1 is_null=1 */
+###   @25=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @26=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @27=NULL /* DECIMAL(10,0) meta=2560 nullable=1 is_null=1 */
+###   @28=NULL /* DATE meta=0 nullable=1 is_null=1 */
+###   @29=NULL /* DATETIME(0) meta=0 nullable=1 is_null=1 */
 ###   @30=1000000000 /* TIMESTAMP(0) meta=0 nullable=0 is_null=0 */
-###   @31=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @32=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @33=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @34=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @35=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @36=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @37=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @38=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @39=NULL /* TIMESTAMP(0) meta=65027 nullable=1 is_null=1 */
-###   @40=NULL /* TIMESTAMP(0) meta=57085 nullable=1 is_null=1 */
-###   @41=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @42=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @43=NULL /* TIMESTAMP(0) meta=65026 nullable=1 is_null=1 */
-###   @44=NULL /* TIMESTAMP(0) meta=61182 nullable=1 is_null=1 */
-###   @45=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @46=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @47=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @48=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @49=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @50=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @51=NULL /* TIMESTAMP(0) meta=765 nullable=1 is_null=1 */
-###   @52=NULL /* TIMESTAMP(0) meta=783 nullable=1 is_null=1 */
-###   @53=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @54=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @55=NULL /* TIMESTAMP(0) meta=510 nullable=1 is_null=1 */
-###   @56=NULL /* TIMESTAMP(0) meta=522 nullable=1 is_null=1 */
-###   @57=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @58=NULL /* TIMESTAMP(0) meta=65024 nullable=1 is_null=1 */
-###   @59=NULL /* TIMESTAMP(0) meta=65025 nullable=1 is_null=1 */
-###   @60=NULL /* TIMESTAMP(0) meta=65279 nullable=1 is_null=1 */
-###   @61=NULL /* TIMESTAMP(0) meta=0 nullable=1 is_null=1 */
-###   @62=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @63=NULL /* TIMESTAMP(0) meta=255 nullable=1 is_null=1 */
-###   @64=NULL /* TIMESTAMP(0) meta=261 nullable=1 is_null=1 */
-###   @65=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @66=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @67=NULL /* TIMESTAMP(0) meta=1 nullable=1 is_null=1 */
-###   @68=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @69=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @70=NULL /* TIMESTAMP(0) meta=2 nullable=1 is_null=1 */
-###   @71=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @72=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @73=NULL /* TIMESTAMP(0) meta=3 nullable=1 is_null=1 */
-###   @74=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @75=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @76=NULL /* TIMESTAMP(0) meta=4 nullable=1 is_null=1 */
-###   @77=NULL /* TIMESTAMP(0) meta=63233 nullable=1 is_null=1 */
-###   @78=NULL /* TIMESTAMP(0) meta=63489 nullable=1 is_null=1 */
+###   @31=NULL /* TIME(0) meta=0 nullable=1 is_null=1 */
+###   @32=NULL /* YEAR meta=0 nullable=1 is_null=1 */
+###   @33=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @34=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @35=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @36=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @37=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @38=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @39=NULL /* STRING(3) meta=65027 nullable=1 is_null=1 */
+###   @40=NULL /* STRING(765) meta=57085 nullable=1 is_null=1 */
+###   @41=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @42=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @43=NULL /* STRING(2) meta=65026 nullable=1 is_null=1 */
+###   @44=NULL /* STRING(510) meta=61182 nullable=1 is_null=1 */
+###   @45=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @46=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @47=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @48=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @49=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @50=NULL /* VARSTRING(3) meta=3 nullable=1 is_null=1 */
+###   @51=NULL /* VARSTRING(765) meta=765 nullable=1 is_null=1 */
+###   @52=NULL /* VARSTRING(783) meta=783 nullable=1 is_null=1 */
+###   @53=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @54=NULL /* VARSTRING(2) meta=2 nullable=1 is_null=1 */
+###   @55=NULL /* VARSTRING(510) meta=510 nullable=1 is_null=1 */
+###   @56=NULL /* VARSTRING(522) meta=522 nullable=1 is_null=1 */
+###   @57=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @58=NULL /* STRING(0) meta=65024 nullable=1 is_null=1 */
+###   @59=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
+###   @60=NULL /* STRING(255) meta=65279 nullable=1 is_null=1 */
+###   @61=NULL /* VARSTRING(0) meta=0 nullable=1 is_null=1 */
+###   @62=NULL /* VARSTRING(1) meta=1 nullable=1 is_null=1 */
+###   @63=NULL /* VARSTRING(255) meta=255 nullable=1 is_null=1 */
+###   @64=NULL /* VARSTRING(261) meta=261 nullable=1 is_null=1 */
+###   @65=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @66=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @67=NULL /* TINYBLOB/TINYTEXT meta=1 nullable=1 is_null=1 */
+###   @68=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @69=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @70=NULL /* BLOB/TEXT meta=2 nullable=1 is_null=1 */
+###   @71=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @72=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @73=NULL /* MEDIUMBLOB/MEDIUMTEXT meta=3 nullable=1 is_null=1 */
+###   @74=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @75=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @76=NULL /* LONGBLOB/LONGTEXT meta=4 nullable=1 is_null=1 */
+###   @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
+###   @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
 ###   @79=4 /* INT meta=0 nullable=1 is_null=0 */
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
@@ -3944,8 +3944,8 @@ crn INT -- row number
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4003,8 +4003,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -4080,8 +4080,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -4353,8 +4353,8 @@ c_3_n INT -- row number
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -4412,8 +4412,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
@@ -4471,8 +4471,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t3`
 ### SET
@@ -4530,14 +4530,14 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 # at #
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
@@ -4714,14 +4714,14 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 # at #
+#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 # at #
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
@@ -4925,8 +4925,8 @@ c3 VARCHAR(60)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
index 92e8438094f..d1c6ef1f100 100644
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
@@ -175,8 +175,8 @@ c2 VARCHAR(20)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -191,8 +191,8 @@ BEGIN
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -216,8 +216,8 @@ BEGIN
 ###   @1=13 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -248,8 +248,8 @@ TRUNCATE TABLE t1
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
@@ -274,8 +274,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t2`
 ### WHERE
@@ -309,8 +309,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t2`
 ### WHERE
@@ -327,8 +327,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
@@ -343,8 +343,8 @@ BEGIN
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t1`
 ### WHERE
@@ -368,8 +368,8 @@ BEGIN
 ###   @1=13 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
@@ -400,8 +400,8 @@ TRUNCATE TABLE t2
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
@@ -426,8 +426,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE `test`.`t2`
 ### WHERE
@@ -461,8 +461,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t2`
 ### WHERE
diff --git a/mysql-test/suite/binlog/r/binlog_row_annotate.result b/mysql-test/suite/binlog/r/binlog_row_annotate.result
index 2d1e3b97b3f..6070f2da608 100644
--- a/mysql-test/suite/binlog/r/binlog_row_annotate.result
+++ b/mysql-test/suite/binlog/r/binlog_row_annotate.result
@@ -144,8 +144,8 @@ CREATE DATABASE test3
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test1`.`t1`
 ### SET
@@ -168,10 +168,10 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> INSERT INTO test2.t2 VALUES (1), (2), (3)
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -194,10 +194,10 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> INSERT INTO test3.t3 VALUES (1), (2), (3)
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test3`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test3`.`t3`
 ### SET
@@ -220,15 +220,15 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
-# at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> DELETE test1.t1, test2.t2
 #Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
 #Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test1`.`t1`
@@ -261,10 +261,10 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> INSERT INTO test2.v2 VALUES (1), (2), (3)
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -287,12 +287,12 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> DELETE xtest1.xt1, test2.t2
 #Q> FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3
 #Q> WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test2`.`t2`
 ### WHERE
@@ -381,8 +381,8 @@ CREATE DATABASE test1
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test1`.`t1`
 ### SET
@@ -431,14 +431,14 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
-# at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> DELETE test1.t1, test2.t2
 #Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
 #Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
+# at #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id #
 ### DELETE FROM `test1`.`t1`
 ### WHERE
@@ -569,8 +569,8 @@ CREATE DATABASE test3
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test1`.`t1`
 ### SET
@@ -593,8 +593,8 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -617,8 +617,8 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test3`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test3`.`t3`
 ### SET
@@ -641,11 +641,11 @@ BEGIN
 /*!*/;
 # at #
 # at #
+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
 # at #
+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
 # at #
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
-#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test1`.`t1`
@@ -678,8 +678,8 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -702,8 +702,8 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test2`.`t2`
 ### WHERE
@@ -812,8 +812,8 @@ CREATE DATABASE test3
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test1`.`t1`
 ### SET
@@ -836,10 +836,10 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> INSERT INTO test2.t2 VALUES (1), (2), (3)
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -862,10 +862,10 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> INSERT INTO test3.t3 VALUES (1), (2), (3)
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test3`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test3`.`t3`
 ### SET
@@ -888,15 +888,15 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
-# at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> DELETE test1.t1, test2.t2
 #Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
 #Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test1`.`t1`
@@ -929,10 +929,10 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> INSERT INTO test2.v2 VALUES (1), (2), (3)
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -955,12 +955,12 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> DELETE xtest1.xt1, test2.t2
 #Q> FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3
 #Q> WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test2`.`t2`
 ### WHERE
@@ -1049,8 +1049,8 @@ CREATE DATABASE test1
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test1`.`t1`
 ### SET
@@ -1099,14 +1099,14 @@ BEGIN
 /*!*/;
 # at #
 # at #
-# at #
-# at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
 #Q> DELETE test1.t1, test2.t2
 #Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
 #Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
+# at #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id #
 ### DELETE FROM `test1`.`t1`
 ### WHERE
@@ -1237,8 +1237,8 @@ CREATE DATABASE test3
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test1`.`t1`
 ### SET
@@ -1260,8 +1260,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -1283,8 +1283,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test3`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test3`.`t3`
 ### SET
@@ -1306,11 +1306,11 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
 # at #
+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
 # at #
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #
-#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test1`.`t1`
@@ -1342,8 +1342,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -1365,8 +1365,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test2`.`t2`
 ### WHERE
diff --git a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
index ad5d0500d19..7c17d8ca53c 100644
--- a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
+++ b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
@@ -65,8 +65,8 @@ CREATE TABLE t1 (a INT, b INT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `new_test1`.`t1`
 ### SET
@@ -96,8 +96,8 @@ CREATE TABLE t2 (a INT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -116,8 +116,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `new_test1`.`t1`
 ### WHERE
@@ -143,8 +143,8 @@ CREATE TABLE t3 (a INT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test3`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `new_test3`.`t3`
 ### SET
@@ -163,8 +163,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `new_test1`.`t1`
 ### SET
@@ -181,8 +181,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `new_test1`.`t1`
 ### SET
@@ -215,8 +215,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test3`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `new_test3`.`t3`
 ### WHERE
@@ -277,8 +277,8 @@ CREATE TABLE t1 (a INT, b INT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `new_test1`.`t1`
 ### SET
@@ -308,8 +308,8 @@ CREATE TABLE t2 (a INT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test2`.`t2`
 ### SET
@@ -328,8 +328,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `new_test1`.`t1`
 ### WHERE
@@ -355,8 +355,8 @@ CREATE TABLE t3 (a INT)
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test3`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `new_test3`.`t3`
 ### SET
@@ -375,8 +375,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `new_test1`.`t1`
 ### SET
@@ -393,8 +393,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test1`.`t1` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `new_test1`.`t1`
 ### SET
@@ -427,8 +427,8 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
-# at #
 #010909  4:46:40 server id #  end_log_pos # 	Table_map: `new_test3`.`t3` mapped to number #
+# at #
 #010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `new_test3`.`t3`
 ### WHERE
diff --git a/mysql-test/t/mysqlbinlog_row_minimal.opt b/mysql-test/t/mysqlbinlog_row_minimal.opt
new file mode 100644
index 00000000000..0e90a53dd3a
--- /dev/null
+++ b/mysql-test/t/mysqlbinlog_row_minimal.opt
@@ -0,0 +1 @@
+--binlog-row-image=minimal
diff --git a/mysql-test/t/mysqlbinlog_row_minimal.test b/mysql-test/t/mysqlbinlog_row_minimal.test
new file mode 100644
index 00000000000..7d165b1c6a0
--- /dev/null
+++ b/mysql-test/t/mysqlbinlog_row_minimal.test
@@ -0,0 +1,33 @@
+#
+# Test for minimal row format
+#
+
+--source include/have_log_bin.inc
+--source include/have_binlog_format_row.inc
+
+#
+# MDEV-8426
+# mysqlbinlog: "Corrupted replication event was detected. Not printing the
+# value" with binlog-row-image=minimal
+#
+
+CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1));
+CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1));
+INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "");
+INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL);
+INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A");
+INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A");
+INSERT INTO t2 SELECT * FROM t1;
+UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL;
+DELETE FROM t1;
+DELETE FROM t2;
+
+--let $binlog = query_get_value(SHOW MASTER STATUS, File, 1)
+--let $datadir = `SELECT @@datadir`
+
+FLUSH BINARY LOGS;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_regex /\d\d\d\d\d\d \d\d:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/
+--exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
+
+DROP TABLE t1,t2;
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 84e87f33335..81b72fe7787 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -2161,6 +2161,7 @@ my_b_write_sint32_and_uint32(IO_CACHE *file, int32 si, uint32 ui)
   @param[out] typestr_length   Size of typestr
   
   @retval   - number of bytes scanned from ptr.
+              Except in case of NULL, in which case we return 1 to indicate ok
 */
 
 static size_t
@@ -2193,41 +2194,57 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
   switch (type) {
   case MYSQL_TYPE_LONG:
     {
+      strmake(typestr, "INT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       int32 si= sint4korr(ptr);
       uint32 ui= uint4korr(ptr);
       my_b_write_sint32_and_uint32(file, si, ui);
-      strmake(typestr, "INT", typestr_length);
       return 4;
     }
 
   case MYSQL_TYPE_TINY:
     {
+      strmake(typestr, "TINYINT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       my_b_write_sint32_and_uint32(file, (int) (signed char) *ptr,
                                   (uint) (unsigned char) *ptr);
-      strmake(typestr, "TINYINT", typestr_length);
       return 1;
     }
 
   case MYSQL_TYPE_SHORT:
     {
+      strmake(typestr, "SHORTINT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       int32 si= (int32) sint2korr(ptr);
       uint32 ui= (uint32) uint2korr(ptr);
       my_b_write_sint32_and_uint32(file, si, ui);
-      strmake(typestr, "SHORTINT", typestr_length);
       return 2;
     }
   
   case MYSQL_TYPE_INT24:
     {
+      strmake(typestr, "MEDIUMINT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       int32 si= sint3korr(ptr);
       uint32 ui= uint3korr(ptr);
       my_b_write_sint32_and_uint32(file, si, ui);
-      strmake(typestr, "MEDIUMINT", typestr_length);
       return 3;
     }
 
   case MYSQL_TYPE_LONGLONG:
     {
+      strmake(typestr, "LONGINT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       char tmp[64];
       size_t length;
       longlong si= sint8korr(ptr);
@@ -2239,7 +2256,6 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
         longlong10_to_str((longlong) ui, tmp, 10);
         my_b_printf(file, " (%s)", tmp);        
       }
-      strmake(typestr, "LONGINT", typestr_length);
       return 8;
     }
 
@@ -2247,6 +2263,11 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
     {
       uint precision= meta >> 8;
       uint decimals= meta & 0xFF;
+      my_snprintf(typestr, typestr_length, "DECIMAL(%d,%d)",
+                  precision, decimals);
+      if (!ptr)
+        goto return_null;
+
       uint bin_size= my_decimal_get_binary_size(precision, decimals);
       my_decimal dec;
       binary2my_decimal(E_DEC_FATAL_ERROR, (uchar*) ptr, &dec,
@@ -2255,30 +2276,34 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
       char buff[DECIMAL_MAX_STR_LENGTH + 1];
       decimal2string(&dec, buff, &length, 0, 0, 0);
       my_b_write(file, (uchar*)buff, length);
-      my_snprintf(typestr, typestr_length, "DECIMAL(%d,%d)",
-                  precision, decimals);
       return bin_size;
     }
 
   case MYSQL_TYPE_FLOAT:
     {
+      strmake(typestr, "FLOAT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       float fl;
       float4get(fl, ptr);
       char tmp[320];
       sprintf(tmp, "%-20g", (double) fl);
       my_b_printf(file, "%s", tmp); /* my_snprintf doesn't support %-20g */
-      strmake(typestr, "FLOAT", typestr_length);
       return 4;
     }
 
   case MYSQL_TYPE_DOUBLE:
     {
       double dbl;
+      strmake(typestr, "DOUBLE", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       float8get(dbl, ptr);
       char tmp[320];
       sprintf(tmp, "%-.20g", dbl); /* strmake doesn't support %-20g */
       my_b_printf(file, tmp, "%s");
-      strcpy(typestr, "DOUBLE");
       return 8;
     }
   
@@ -2286,33 +2311,46 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
     {
       /* Meta-data: bit_len, bytes_in_rec, 2 bytes */
       uint nbits= ((meta >> 8) * 8) + (meta & 0xFF);
+      my_snprintf(typestr, typestr_length, "BIT(%d)", nbits);
+      if (!ptr)
+        goto return_null;
+
       length= (nbits + 7) / 8;
       my_b_write_bit(file, ptr, nbits);
-      my_snprintf(typestr, typestr_length, "BIT(%d)", nbits);
       return length;
     }
 
   case MYSQL_TYPE_TIMESTAMP:
     {
+      strmake(typestr, "TIMESTAMP", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       uint32 i32= uint4korr(ptr);
       my_b_printf(file, "%d", i32);
-      strmake(typestr, "TIMESTAMP", typestr_length);
       return 4;
     }
 
   case MYSQL_TYPE_TIMESTAMP2:
     {
+      my_snprintf(typestr, typestr_length, "TIMESTAMP(%d)", meta);
+      if (!ptr)
+        goto return_null;
+
       char buf[MAX_DATE_STRING_REP_LENGTH];
       struct timeval tm;
       my_timestamp_from_binary(&tm, ptr, meta);
       int buflen= my_timeval_to_str(&tm, buf, meta);
       my_b_write(file, (uchar*)buf, buflen);
-      my_snprintf(typestr, typestr_length, "TIMESTAMP(%d)", meta);
       return my_timestamp_binary_length(meta);
     }
 
   case MYSQL_TYPE_DATETIME:
     {
+      strmake(typestr, "DATETIME", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       ulong d, t;
       uint64 i64= uint8korr(ptr); /* YYYYMMDDhhmmss */
       d= (ulong) (i64 / 1000000);
@@ -2321,47 +2359,59 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
       my_b_printf(file, "%04d-%02d-%02d %02d:%02d:%02d",
                   (int) (d / 10000), (int) (d % 10000) / 100, (int) (d % 100),
                   (int) (t / 10000), (int) (t % 10000) / 100, (int) t % 100);
-      strmake(typestr, "DATETIME", typestr_length);
       return 8;
     }
 
   case MYSQL_TYPE_DATETIME2:
     {
+      my_snprintf(typestr, typestr_length, "DATETIME(%d)", meta);
+      if (!ptr)
+        goto return_null;
+
       char buf[MAX_DATE_STRING_REP_LENGTH];
       MYSQL_TIME ltime;
       longlong packed= my_datetime_packed_from_binary(ptr, meta);
       TIME_from_longlong_datetime_packed(&ltime, packed);
       int buflen= my_datetime_to_str(&ltime, buf, meta);
       my_b_write_quoted(file, (uchar *) buf, buflen);
-      my_snprintf(typestr, typestr_length, "DATETIME(%d)", meta);
       return my_datetime_binary_length(meta);
     }
 
   case MYSQL_TYPE_TIME:
     {
+      strmake(typestr, "TIME",  typestr_length);
+      if (!ptr)
+        goto return_null;
+
       int32 tmp= sint3korr(ptr);
       int32 i32= tmp >= 0 ? tmp : - tmp;
       const char *sign= tmp < 0 ? "-" : "";
       my_b_printf(file, "'%s%02d:%02d:%02d'",
                   sign, i32 / 10000, (i32 % 10000) / 100, i32 % 100, i32);
-      strmake(typestr, "TIME",  typestr_length);
       return 3;
     }
 
   case MYSQL_TYPE_TIME2:
     {
+      my_snprintf(typestr, typestr_length, "TIME(%d)", meta);
+      if (!ptr)
+        goto return_null;
+
       char buf[MAX_DATE_STRING_REP_LENGTH];
       MYSQL_TIME ltime;
       longlong packed= my_time_packed_from_binary(ptr, meta);
       TIME_from_longlong_time_packed(&ltime, packed);
       int buflen= my_time_to_str(&ltime, buf, meta);
       my_b_write_quoted(file, (uchar *) buf, buflen);
-      my_snprintf(typestr, typestr_length, "TIME(%d)", meta);
       return my_time_binary_length(meta);
     }
 
   case MYSQL_TYPE_NEWDATE:
     {
+      strmake(typestr, "DATE", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       uint32 tmp= uint3korr(ptr);
       int part;
       char buf[11];
@@ -2383,39 +2433,50 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
       *pos--= (char) ('0'+part%10); part/=10;
       *pos=   (char) ('0'+part);
       my_b_printf(file , "'%s'", buf);
-      strmake(typestr, "DATE", typestr_length);
       return 3;
     }
     
   case MYSQL_TYPE_DATE:
     {
+      strmake(typestr, "DATE", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       uint i32= uint3korr(ptr);
       my_b_printf(file , "'%04d:%02d:%02d'",
                   (int)(i32 / (16L * 32L)), (int)(i32 / 32L % 16L),
                   (int)(i32 % 32L));
-      strmake(typestr, "DATE", typestr_length);
       return 3;
     }
   
   case MYSQL_TYPE_YEAR:
     {
+      strmake(typestr, "YEAR", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       uint32 i32= *ptr;
       my_b_printf(file, "%04d", i32+ 1900);
-      strmake(typestr, "YEAR", typestr_length);
       return 1;
     }
   
   case MYSQL_TYPE_ENUM:
     switch (meta & 0xFF) {
     case 1:
-      my_b_printf(file, "%d", (int) *ptr);
       strmake(typestr, "ENUM(1 byte)", typestr_length);
+      if (!ptr)
+        goto return_null;
+
+      my_b_printf(file, "%d", (int) *ptr);
       return 1;
     case 2:
       {
+        strmake(typestr, "ENUM(2 bytes)", typestr_length);
+      if (!ptr)
+        goto return_null;
+
         int32 i32= uint2korr(ptr);
         my_b_printf(file, "%d", i32);
-        strmake(typestr, "ENUM(2 bytes)", typestr_length);
         return 2;
       }
     default:
@@ -2425,31 +2486,46 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
     break;
     
   case MYSQL_TYPE_SET:
-    my_b_write_bit(file, ptr , (meta & 0xFF) * 8);
     my_snprintf(typestr, typestr_length, "SET(%d bytes)", meta & 0xFF);
+      if (!ptr)
+        goto return_null;
+
+    my_b_write_bit(file, ptr , (meta & 0xFF) * 8);
     return meta & 0xFF;
   
   case MYSQL_TYPE_BLOB:
     switch (meta) {
     case 1:
+      strmake(typestr, "TINYBLOB/TINYTEXT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       length= *ptr;
       my_b_write_quoted(file, ptr + 1, length);
-      strmake(typestr, "TINYBLOB/TINYTEXT", typestr_length);
       return length + 1;
     case 2:
+      strmake(typestr, "BLOB/TEXT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       length= uint2korr(ptr);
       my_b_write_quoted(file, ptr + 2, length);
-      strmake(typestr, "BLOB/TEXT", typestr_length);
       return length + 2;
     case 3:
+      strmake(typestr, "MEDIUMBLOB/MEDIUMTEXT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       length= uint3korr(ptr);
       my_b_write_quoted(file, ptr + 3, length);
-      strmake(typestr, "MEDIUMBLOB/MEDIUMTEXT", typestr_length);
       return length + 3;
     case 4:
+      strmake(typestr, "LONGBLOB/LONGTEXT", typestr_length);
+      if (!ptr)
+        goto return_null;
+
       length= uint4korr(ptr);
       my_b_write_quoted(file, ptr + 4, length);
-      strmake(typestr, "LONGBLOB/LONGTEXT", typestr_length);
       return length + 4;
     default:
       my_b_printf(file, "!! Unknown BLOB packlen=%d", length);
@@ -2460,10 +2536,16 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
   case MYSQL_TYPE_VAR_STRING:
     length= meta;
     my_snprintf(typestr, typestr_length, "VARSTRING(%d)", length);
+    if (!ptr)
+      goto return_null;
+
     return my_b_write_quoted_with_length(file, ptr, length);
 
   case MYSQL_TYPE_STRING:
     my_snprintf(typestr, typestr_length, "STRING(%d)", length);
+    if (!ptr)
+      goto return_null;
+
     return my_b_write_quoted_with_length(file, ptr, length);
 
   case MYSQL_TYPE_DECIMAL:
@@ -2484,6 +2566,9 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
   }
   *typestr= 0;
   return 0;
+
+return_null:
+  return my_b_write(file, (uchar*) "NULL", 4) ? 0 : 1;
 }
 
 
@@ -2512,25 +2597,27 @@ Rows_log_event::print_verbose_one_row(IO_CACHE *file, table_def *td,
   uint null_bit_index= 0;
   char typestr[64]= "";
   
-  value+= (m_width + 7) / 8;
+  /*
+    Skip metadata bytes which gives the information about nullabity of master
+    columns. Master writes one bit for each affected column.
+   */
+
+  value+= (bitmap_bits_set(cols_bitmap) + 7) / 8;
   
   my_b_printf(file, "%s", prefix);
   
   for (size_t i= 0; i < td->size(); i ++)
   {
+    size_t size;
     int is_null= (null_bits[null_bit_index / 8] 
                   >> (null_bit_index % 8))  & 0x01;
 
     if (bitmap_is_set(cols_bitmap, i) == 0)
       continue;
     
-    if (is_null)
-    {
-      my_b_printf(file, "###   @%lu=NULL", (ulong)i + 1);
-    }
-    else
+    my_b_printf(file, "###   @%d=", static_cast<int>(i + 1));
+    if (!is_null)
     {
-      my_b_printf(file, "###   @%lu=", (ulong)i + 1);
       size_t fsize= td->calc_field_size((uint)i, (uchar*) value);
       if (value + fsize > m_rows_end)
       {
@@ -2539,23 +2626,20 @@ Rows_log_event::print_verbose_one_row(IO_CACHE *file, table_def *td,
         value+= fsize;
         return 0;
       }
-      size_t size= log_event_print_value(file, value,
-                                         td->type(i), td->field_metadata(i),
-                                         typestr, sizeof(typestr));
-      if (!size)
-        return 0;
+    }
+    if (!(size= log_event_print_value(file,is_null? NULL: value,
+                                      td->type(i), td->field_metadata(i),
+                                      typestr, sizeof(typestr))))
+      return 0;
 
+    if (!is_null)
       value+= size;
-    }
 
     if (print_event_info->verbose > 1)
     {
       my_b_write(file, (uchar*)" /* ", 4);
 
-      if (typestr[0])
-        my_b_printf(file, "%s ", typestr);
-      else
-        my_b_printf(file, "type=%d ", td->type(i));
+      my_b_printf(file, "%s ", typestr);
       
       my_b_printf(file, "meta=%d nullable=%d is_null=%d ",
                   td->field_metadata(i),
@@ -11093,7 +11177,7 @@ void Table_map_log_event::pack_info(Protocol *protocol)
 
 
 #ifdef MYSQL_CLIENT
-void Table_map_log_event::print(FILE *, PRINT_EVENT_INFO *print_event_info)
+void Table_map_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info)
 {
   if (!print_event_info->short_form)
   {
@@ -11104,6 +11188,7 @@ void Table_map_log_event::print(FILE *, PRINT_EVENT_INFO *print_event_info)
                 ((m_flags & TM_BIT_HAS_TRIGGERS_F) ?
                  " (has triggers)" : ""));
     print_base64(&print_event_info->body_cache, print_event_info, TRUE);
+    copy_event_cache_to_file_and_reinit(&print_event_info->head_cache, file);
   }
 }
 #endif
author	Monty <monty@mariadb.org>	2015-11-10 13:40:15 +0200
committer	Monty <monty@mariadb.org>	2015-11-10 13:46:57 +0200
commit	2f63e2e2a0575d60572b8fdef55f90173c36b10b (patch)
tree	8b5cefd99cf610641b4b138608bd4c404fe9d3c3
parent	78771189e769cf5f1444c2c51a3813d45ac120e2 (diff)
download	mariadb-git-2f63e2e2a0575d60572b8fdef55f90173c36b10b.tar.gz