Additional fix for bug#31455 (rpl decoder)

- Implementing --base64-format=decode-rows, to display SQL-alike decoded row events without their BINLOG statements. - Adding --base64-format=decode-rows into tests when calling mysqlbinlog to avoid non-deterministic results - Removing resetting of last_table_id in "RESET MASTER", which appeared to be dangerous.
2025-12-24 11:21:21 +03:00 · 2008-08-21 16:47:23 +05:00
parent 0c5bc2eafc
commit 762df2d05c
14 changed files with 513 additions and 3726 deletions
--- a/mysql-test/include/mysqlbinlog_row_engine.inc
+++ b/mysql-test/include/mysqlbinlog_row_engine.inc
@@ -1650,8 +1650,8 @@ FLUSH LOGS;
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/
--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/
+--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001

 --echo #
 --echo # Cleanup.
@@ -1730,8 +1730,8 @@ FLUSH LOGS;
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/
--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/
+--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001

 --echo #
 --echo # Cleanup.
@@ -1853,8 +1853,8 @@ FLUSH LOGS;
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/
--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/
+--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001

 --echo #
 --echo # Cleanup.
@@ -1911,8 +1911,8 @@ FLUSH LOGS;
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/
--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/
+--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001

 --echo #
 --echo # Cleanup.
--- a/mysql-test/r/mysqlbinlog_row.result
+++ b/mysql-test/r/mysqlbinlog_row.result
--- a/mysql-test/r/mysqlbinlog_row_innodb.result
+++ b/mysql-test/r/mysqlbinlog_row_innodb.result
--- a/mysql-test/r/mysqlbinlog_row_myisam.result
+++ b/mysql-test/r/mysqlbinlog_row_myisam.result
--- a/mysql-test/r/mysqlbinlog_row_trans.result
+++ b/mysql-test/r/mysqlbinlog_row_trans.result
@@ -130,10 +130,6 @@ DELIMITER /*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Start: binlog v 4, server v 5.1.28-debug-log created 010909  4:46:40 at startup
 ROLLBACK/*!*/;
-BINLOG '
-AMqaOw8BAAAAZgAAAGoAAAAAAAQANS4xLjI4LWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAypo7EzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
-'/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 use test/*!*/;
@@ -166,14 +162,8 @@ BEGIN
 /*!*/;
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number 0
-#010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id 0 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAPYBAAAAAAAAAAAAAAAABHRlc3QAAnQxAAIDDwIUAAM=
-AMqaOxcBAAAASgAAAEACAAAQAAAAAAAAAAEAAv/8AQAAAAl2YXJjaGFyLTH8AgAAAAl2YXJjaGFy
-LTL8AwAAAAl2YXJjaGFyLTM=
-'/*!*/;
+#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 # flags: STMT_END_F
 ### INSERT INTO test.t1
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -188,15 +178,8 @@ LTL8AwAAAAl2YXJjaGFyLTM=
 ###   @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 0
-#010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id 0 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAGwCAAAAAAAAAAAAAAAABHRlc3QAAnQxAAIDDwIUAAM=
-AMqaOxgBAAAAeAAAAOQCAAAQAAAAAAAAAAEAAv///AEAAAAJdmFyY2hhci0x/AsAAAAJdmFyY2hh
-ci0x/AIAAAAJdmFyY2hhci0y/AwAAAAJdmFyY2hhci0y/AMAAAAJdmFyY2hhci0z/A0AAAAJdmFy
-Y2hhci0z
-'/*!*/;
+#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 # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE test.t1
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -220,13 +203,8 @@ Y2hhci0z
 ###   @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 0
-#010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id 0 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAABADAAAAAAAAAAAAAAAABHRlc3QAAnQxAAIDDwIUAAM=
-AMqaOxkBAAAALAAAADwDAAAQAAAAAAAAAAEAAv/8DAAAAAl2YXJjaGFyLTI=
-'/*!*/;
+#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 # flags: STMT_END_F
 ### DELETE FROM test.t1
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
@@ -267,14 +245,8 @@ BEGIN
 /*!*/;
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number 0
-#010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id 0 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAACUFAAAAAAAAAAAAAAAABHRlc3QAAnQxAAIDDwIUAAM=
-AMqaOxcBAAAASgAAAG8FAAAQAAAAAAAAAAEAAv/8AQAAAAl2YXJjaGFyLTH8AgAAAAl2YXJjaGFy
-LTL8AwAAAAl2YXJjaGFyLTM=
-'/*!*/;
+#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 # flags: STMT_END_F
 ### INSERT INTO test.t1
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -289,15 +261,8 @@ LTL8AwAAAAl2YXJjaGFyLTM=
 ###   @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 0
-#010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id 0 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAJsFAAAAAAAAAAAAAAAABHRlc3QAAnQxAAIDDwIUAAM=
-AMqaOxgBAAAAeAAAABMGAAAQAAAAAAAAAAEAAv///AEAAAAJdmFyY2hhci0x/AsAAAAJdmFyY2hh
-ci0x/AIAAAAJdmFyY2hhci0y/AwAAAAJdmFyY2hhci0y/AMAAAAJdmFyY2hhci0z/A0AAAAJdmFy
-Y2hhci0z
-'/*!*/;
+#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 # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE test.t1
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -321,27 +286,16 @@ Y2hhci0z
 ###   @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 0
-#010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id 0 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAD8GAAAAAAAAAAAAAAAABHRlc3QAAnQxAAIDDwIUAAM=
-AMqaOxkBAAAALAAAAGsGAAAQAAAAAAAAAAEAAv/8DAAAAAl2YXJjaGFyLTI=
-'/*!*/;
+#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 # flags: STMT_END_F
 ### DELETE FROM test.t1
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number 1
-#010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id 1 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAJcGAAAAAAEAAAAAAAAABHRlc3QAAnQyAAIDDwIUAAM=
-AMqaOxcBAAAASgAAAOEGAAAQAAEAAAAAAAEAAv/8AQAAAAl2YXJjaGFyLTH8AgAAAAl2YXJjaGFy
-LTL8AwAAAAl2YXJjaGFyLTM=
-'/*!*/;
+#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 # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO test.t2
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -356,15 +310,8 @@ LTL8AwAAAAl2YXJjaGFyLTM=
 ###   @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`.`t2` mapped to number 1
-#010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id 1 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAA0HAAAAAAEAAAAAAAAABHRlc3QAAnQyAAIDDwIUAAM=
-AMqaOxgBAAAAeAAAAIUHAAAQAAEAAAAAAAEAAv///AEAAAAJdmFyY2hhci0x/AsAAAAJdmFyY2hh
-ci0x/AIAAAAJdmFyY2hhci0y/AwAAAAJdmFyY2hhci0y/AMAAAAJdmFyY2hhci0z/A0AAAAJdmFy
-Y2hhci0z
-'/*!*/;
+#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 # flags: STMT_END_F
 ### UPDATE test.t2
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -388,13 +335,8 @@ Y2hhci0z
 ###   @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`.`t2` mapped to number 1
-#010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id 1 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAALEHAAAAAAEAAAAAAAAABHRlc3QAAnQyAAIDDwIUAAM=
-AMqaOxkBAAAALAAAAN0HAAAQAAEAAAAAAAEAAv/8DAAAAAl2YXJjaGFyLTI=
-'/*!*/;
+#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 # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM test.t2
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
@@ -427,14 +369,8 @@ BEGIN
 /*!*/;
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number 0
-#010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id 0 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAGcJAAAAAAAAAAAAAAAABHRlc3QAAnQxAAIDDwIUAAM=
-AMqaOxcBAAAASgAAALEJAAAQAAAAAAAAAAEAAv/8AQAAAAl2YXJjaGFyLTH8AgAAAAl2YXJjaGFy
-LTL8AwAAAAl2YXJjaGFyLTM=
-'/*!*/;
+#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 # flags: STMT_END_F
 ### INSERT INTO test.t1
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -449,15 +385,8 @@ LTL8AwAAAAl2YXJjaGFyLTM=
 ###   @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 0
-#010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id 0 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAN0JAAAAAAAAAAAAAAAABHRlc3QAAnQxAAIDDwIUAAM=
-AMqaOxgBAAAAeAAAAFUKAAAQAAAAAAAAAAEAAv///AEAAAAJdmFyY2hhci0x/AsAAAAJdmFyY2hh
-ci0x/AIAAAAJdmFyY2hhci0y/AwAAAAJdmFyY2hhci0y/AMAAAAJdmFyY2hhci0z/A0AAAAJdmFy
-Y2hhci0z
-'/*!*/;
+#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 # 	Update_rows: table id # flags: STMT_END_F
 ### UPDATE test.t1
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -481,27 +410,16 @@ Y2hhci0z
 ###   @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 0
-#010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id 0 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAIEKAAAAAAAAAAAAAAAABHRlc3QAAnQxAAIDDwIUAAM=
-AMqaOxkBAAAALAAAAK0KAAAQAAAAAAAAAAEAAv/8DAAAAAl2YXJjaGFyLTI=
-'/*!*/;
+#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 # flags: STMT_END_F
 ### DELETE FROM test.t1
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 # at #
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number 2
-#010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id 2 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAANkKAAAAAAIAAAAAAAAABHRlc3QAAnQyAAIDDwIUAAM=
-AMqaOxcBAAAASgAAACMLAAAQAAIAAAAAAAEAAv/8AQAAAAl2YXJjaGFyLTH8AgAAAAl2YXJjaGFy
-LTL8AwAAAAl2YXJjaGFyLTM=
-'/*!*/;
+#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 # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO test.t2
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -516,15 +434,8 @@ LTL8AwAAAAl2YXJjaGFyLTM=
 ###   @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`.`t2` mapped to number 2
-#010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id 2 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAE8LAAAAAAIAAAAAAAAABHRlc3QAAnQyAAIDDwIUAAM=
-AMqaOxgBAAAAeAAAAMcLAAAQAAIAAAAAAAEAAv///AEAAAAJdmFyY2hhci0x/AsAAAAJdmFyY2hh
-ci0x/AIAAAAJdmFyY2hhci0y/AwAAAAJdmFyY2hhci0y/AMAAAAJdmFyY2hhci0z/A0AAAAJdmFy
-Y2hhci0z
-'/*!*/;
+#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 # flags: STMT_END_F
 ### UPDATE test.t2
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
@@ -548,13 +459,8 @@ Y2hhci0z
 ###   @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`.`t2` mapped to number 2
-#010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id 2 flags: STMT_END_F
-
-BINLOG '
-AMqaOxMBAAAALAAAAPMLAAAAAAIAAAAAAAAABHRlc3QAAnQyAAIDDwIUAAM=
-AMqaOxkBAAAALAAAAB8MAAAQAAIAAAAAAAEAAv/8DAAAAAl2YXJjaGFyLTI=
-'/*!*/;
+#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 # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM test.t2
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
--- a/mysql-test/t/mysqlbinlog_row.test
+++ b/mysql-test/t/mysqlbinlog_row.test
@@ -442,5 +442,5 @@ flush logs;

 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /thread_id=[0-9]*/thread_id=#/
--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/
+--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001
--- a/mysql-test/t/mysqlbinlog_row_big.test
+++ b/mysql-test/t/mysqlbinlog_row_big.test
@@ -115,7 +115,7 @@ FLUSH LOGS;
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/
--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/$mysqlbinlog_output
+--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/$mysqlbinlog_output

 --echo #
 --echo # Cleanup.
--- a/mysql-test/t/mysqlbinlog_row_trans.test
+++ b/mysql-test/t/mysqlbinlog_row_trans.test
@@ -150,8 +150,8 @@ FLUSH LOGS;
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/
--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/
+--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001

 --echo #
 --echo # Cleanup.