MDEV-7635: Part 1

innodb_autoinc_lock_mode            = 2
innodb_buffer_pool_dump_at_shutdown = ON
innodb_buffer_pool_dump_pct         = 25
innodb_buffer_pool_load_at_startup  = ON
innodb_checksum_algorithm           = CRC32
innodb_file_format                  = Barracuda
innodb_large_prefix                 = ON
innodb_log_compressed_pages         = ON
innodb_purge_threads                = 4
innodb_strict_mode                  = ON
binlog_annotate_row_events          = ON
binlog_format                       = MIXED
binlog-row-event-max-size           = 8192
group_concat_max_len                = 1M
lock_wait_timeout                   = 86400
log_slow_admin_statements           = ON
log_slow_slave_statements           = ON
log_warnings                        = 2
max_allowed_packet                  = 16M
replicate_annotate_row_events       = ON
slave_net_timeout                   = 60
sync_binlog                         = 1
aria_recover                        = BACKUP,QUICK
myisam_recover_options              = BACKUP,QUICK

mysql-test/extra/rpl_tests/rpl_log.test

@@ -43,7 +43,7 @@ source include/show_binlog_events.inc;
 let $binlog_limit= 3;
 source include/show_binlog_events.inc;
 
-let $binlog_limit= 2,4;
+let $binlog_limit= 2,5;
 source include/show_binlog_events.inc;
 let $binlog_limit=;
 flush logs;

mysql-test/extra/rpl_tests/rpl_row_annotate.test

@@ -182,4 +182,8 @@ DROP DATABASE test1;
 sync_slave_with_master;
 --enable_query_log
 
+use test;
+connection slave;
+call mtr.add_suppression("Can't find record in 't3'");
+
 --source include/rpl_end.inc

mysql-test/extra/rpl_tests/rpl_row_basic.test

@@ -411,6 +411,7 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* error.* 1535");
 call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* error.* 1032");
 call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t.. cannot be converted from type.*, error.* 1677");
+call mtr.add_suppression("Can't find record in 't1'");
 
 --let $rpl_only_running_threads= 1
 --source include/rpl_reset.inc

mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc

@@ -4,7 +4,7 @@
 --source extra/rpl_tests/rpl_show_binlog_events.inc
 --let $binlog_limit= 2
 --source extra/rpl_tests/rpl_show_binlog_events.inc
---let $binlog_limit= 2,3
+--let $binlog_limit= 2,4
 --source extra/rpl_tests/rpl_show_binlog_events.inc
 --let $binlog_limit=
 --let $binlog_file=

mysql-test/include/alter_table_mdev539.inc

@@ -2,6 +2,8 @@
 --echo # mdev-539: fast build of unique/primary indexes for MyISAM/Aria
 --echo #
 
+call mtr.add_suppression("Can't find record in '.*'");
+
 --disable_warnings
 DROP DATABASE IF EXISTS dbt3_s001;
 --enable_warnings

mysql-test/mysql-test-run.pl

@@ -4382,6 +4382,7 @@ sub extract_warning_lines ($$) {
      qr|Checking table:   '\..mtr.test_suppressions'|,
      qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|,
      qr|Table '\..mtr.test_suppressions' is marked as crashed and should be repaired|,
+     qr|Table 'test_suppressions' is marked as crashed and should be repaired|,
      qr|Can't open shared library|,
      qr|Couldn't load plugin named .*EXAMPLE.*|,
      qr|InnoDB: Error: table 'test/bug39438'|,

mysql-test/r/alter_table_mdev539_maria.result

@@ -3,6 +3,7 @@ set @@storage_engine= Aria;
 #
 # mdev-539: fast build of unique/primary indexes for MyISAM/Aria
 #
+call mtr.add_suppression("Can't find record in '.*'");
 DROP DATABASE IF EXISTS dbt3_s001;
 CREATE DATABASE dbt3_s001;
 use dbt3_s001;

mysql-test/r/alter_table_mdev539_myisam.result

@@ -3,6 +3,7 @@ set @@storage_engine= MyISAM;
 #
 # mdev-539: fast build of unique/primary indexes for MyISAM/Aria
 #
+call mtr.add_suppression("Can't find record in '.*'");
 DROP DATABASE IF EXISTS dbt3_s001;
 CREATE DATABASE dbt3_s001;
 use dbt3_s001;

mysql-test/r/bootstrap.result

@@ -4,6 +4,8 @@ drop table t1;
 ERROR 42S02: Unknown table 'test.t1'
 set @my_max_allowed_packet= @@max_allowed_packet;
 set global max_allowed_packet=100*@@max_allowed_packet;
+Warnings:
+Warning	1292	Truncated incorrect max_allowed_packet value: '1677721600'
 set global max_allowed_packet=@my_max_allowed_packet;
 drop table t1;
 End of 5.1 tests

mysql-test/r/bug39022.result

 #
 # Bug #39022: Mysql randomly crashing in lock_sec_rec_cons_read_sees
 #
+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
 CREATE TABLE t1(a TINYINT NOT NULL,b TINYINT,PRIMARY KEY(b)) ENGINE=innodb;
 CREATE TABLE t2(d TINYINT NOT NULL,UNIQUE KEY(d)) ENGINE=innodb;
 INSERT INTO t1 VALUES (13,0),(8,1),(9,2),(6,3),

mysql-test/r/ctype_binary.result

@@ -658,7 +658,7 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` blob DEFAULT NULL
+  `c1` mediumblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';

mysql-test/r/ctype_cp1251.result

@@ -1067,7 +1067,7 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text CHARACTER SET cp1251 DEFAULT NULL
+  `c1` mediumtext CHARACTER SET cp1251 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';

mysql-test/r/ctype_cp932_binlog_row.result

@@ -11,6 +11,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(f1 blob)
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES(X'8300')
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT

mysql-test/r/ctype_latin1.result

@@ -1364,7 +1364,7 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text DEFAULT NULL
+  `c1` mediumtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';

mysql-test/r/ctype_ucs.result

@@ -2267,7 +2267,7 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(512) CHARACTER SET ucs2 DEFAULT NULL
+  `c1` mediumtext CHARACTER SET ucs2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';

mysql-test/r/ctype_utf16.result

@@ -1553,7 +1553,7 @@ SELECT space(date_add(101, INTERVAL CHAR('1' USING utf16) hour_second));
 space(date_add(101, INTERVAL CHAR('1' USING utf16) hour_second))
 NULL
 Warnings:
-Warning	1301	Result of space() was larger than max_allowed_packet (4194304) - truncated
+Warning	1301	Result of space() was larger than max_allowed_packet (16777216) - truncated
 #
 # Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULT
 #
@@ -1565,17 +1565,13 @@ SELECT 'a' AS id, REPEAT('bla bla', 100) AS body) t1
 GROUP BY id
 ORDER BY l DESC;
 id	l
-a	512
-Warnings:
-Warning	1260	Row 1 was cut by GROUP_CONCAT()
+a	1401
 SELECT id, CHAR_LENGTH(GROUP_CONCAT(body)) AS l
 FROM (SELECT 'a' AS id, REPEAT('foo bar', 100) AS body
 UNION ALL
 SELECT 'a' AS id, REPEAT('bla bla', 100) AS body) t1;
 id	l
-a	512
-Warnings:
-Warning	1260	Row 1 was cut by GROUP_CONCAT()
+a	1401
 #
 # MDEV-6865 Merge Bug#18935421 RPAD DIES WITH CERTAIN PADSTR INTPUTS..
 #

mysql-test/r/ctype_utf32.result

@@ -1620,9 +1620,7 @@ SELECT 'a' AS id, REPEAT('bla bla', 100) AS body) t1
 GROUP BY id
 ORDER BY l DESC;
 id	l
-a	256
-Warnings:
-Warning	1260	Row 1 was cut by GROUP_CONCAT()
+a	1401
 #
 # incorrect charset for val_str_ascii
 #

mysql-test/r/ctype_utf8.result

@@ -3109,7 +3109,7 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text CHARACTER SET utf8 DEFAULT NULL
+  `c1` mediumtext CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';
@@ -5411,17 +5411,13 @@ SELECT 'a' AS id, REPEAT('bla bla', 100) AS body) t1
 GROUP BY id
 ORDER BY l DESC;
 id	l
-a	1024
-Warnings:
-Warning	1260	Row 2 was cut by GROUP_CONCAT()
+a	1401
 SELECT id, CHAR_LENGTH(GROUP_CONCAT(body)) AS l
 FROM (SELECT 'a' AS id, REPEAT('foo bar', 100) AS body
 UNION ALL
 SELECT 'a' AS id, REPEAT('bla bla', 100) AS body) t1;
 id	l
-a	1024
-Warnings:
-Warning	1260	Row 2 was cut by GROUP_CONCAT()
+a	1401
 #
 # MDEV-7814 Assertion `args[0]->fixed' fails in Item_func_conv_charset::Item_func_conv_charset
 #

mysql-test/r/delete.result

+call mtr.add_suppression("Sort aborted.*");
 drop table if exists t1,t2,t3,t11,t12;
 CREATE TABLE t1 (a tinyint(3), b tinyint(5));
 INSERT INTO t1 VALUES (1,1);

mysql-test/r/filesort_debug.result

+call mtr.add_suppression("Sort aborted.*");
 SET @old_debug= @@session.debug;
 #
 # Bug#36022 please log more information about "Sort aborted" queries

mysql-test/r/func_gconcat.result

@@ -1164,7 +1164,7 @@ t2	CREATE TABLE `t2` (
   `GROUP_CONCAT(UPPER(f1) ORDER BY f2)` mediumtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
-SET group_concat_max_len= DEFAULT;
+SET group_concat_max_len= 1024;
 SELECT LENGTH(GROUP_CONCAT(f1 ORDER BY f2)) FROM t1;
 LENGTH(GROUP_CONCAT(f1 ORDER BY f2))
 1024

mysql-test/r/innodb_mysql_lock.result

 set @old_innodb_lock_wait_timeout=@@global.innodb_lock_wait_timeout;
 set global innodb_lock_wait_timeout=300;
 set session innodb_lock_wait_timeout=300;
+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
 #
 # Bug #22876 Four-way deadlock
 #

mysql-test/r/limit_rows_examined.result

+call mtr.add_suppression("Sort aborted.*");
 set @save_join_cache_level = @@join_cache_level;
 create table t1 (c1 char(2));
 create table t2 (c2 char(2));

mysql-test/r/log_slow.result

@@ -9,10 +9,10 @@ select @@log_slow_verbosity;
 
 show variables like "log_slow%";
 Variable_name	Value
-log_slow_admin_statements	OFF
+log_slow_admin_statements	ON
 log_slow_filter	admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
 log_slow_rate_limit	1
-log_slow_slave_statements	OFF
+log_slow_slave_statements	ON
 log_slow_verbosity	
 set @org_slow_query_log= @@global.slow_query_log;
 set @@log_slow_filter= "filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk,admin";

mysql-test/r/log_state.result

+call mtr.add_suppression("options .* --log_slow_queries is not set");
 SET @old_general_log= @@global.general_log;
 SET @old_general_log_file= @@global.general_log_file;
 SET @old_slow_query_log= @@global.slow_query_log;

mysql-test/r/mix2_myisam.result

+call mtr.add_suppression("Can't find record in .*");
 SET SESSION STORAGE_ENGINE = MEMORY;
 drop table if exists t1,t2,t3,t4;
 drop database if exists mysqltest;

mysql-test/r/mrr_icp_extra.result

+call mtr.add_suppression("Can't find record in .*");
 set @mrr_icp_extra_tmp=@@optimizer_switch;
 set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
 SET NAMES latin1;

mysql-test/r/multi_update.result

@@ -589,6 +589,7 @@ a	b
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	UPDATE t2,t1 SET t2.a=t1.a+2
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 master-bin.000001	#	Update_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
@@ -602,6 +603,7 @@ ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 master-bin.000001	#	Update_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT

mysql-test/r/myisam.result

+call mtr.add_suppression("Can't find record in '.*'");
+call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");
 drop table if exists t1,t2,t3;
 SET SQL_WARNINGS=1;
 CREATE TABLE t1 (

mysql-test/r/myisam_enable_keys-10506.result

+call mtr.add_suppression("Can't find record in '.*'");
 CREATE TABLE t1 (
 pk INT AUTO_INCREMENT,
 i INT,

mysql-test/r/myisam_recover.result

+call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");
 #
 # Tests for corrupted MyISAM tables and MyISAMMRG tables with corrupted
 # children..

mysql-test/r/mysqlbinlog_row_big.result

@@ -96,6 +96,6 @@ FLUSH LOGS;
 # Cleanup.
 #
 # reset variable value to pass testcase checks
-SET @@global.max_allowed_packet = 4194304;
+SET @@global.max_allowed_packet = 16777216;
 DROP TABLE t1;
 remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_big_1.out

mysql-test/r/mysqlbinlog_row_minimal.result

@@ -54,9 +54,12 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN
 BEGIN
 /*!*/;
 # at 816
-#<date> server id 1  end_log_pos 872 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 872
-#<date> server id 1  end_log_pos 941 CRC32 XXX 	Write_rows: table id 30 flags: STMT_END_F
+# at 890
+#<date> server id 1  end_log_pos 890 CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "")
+#<date> server id 1  end_log_pos 946 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 946
+#<date> server id 1  end_log_pos 1015 CRC32 XXX 	Write_rows: table id 30 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -68,20 +71,23 @@ BEGIN
 ###   @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 941
-#<date> server id 1  end_log_pos 1014 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 1015
+#<date> server id 1  end_log_pos 1088 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1014
-#<date> server id 1  end_log_pos 1056 CRC32 XXX 	GTID 0-1-4
+# at 1088
+#<date> server id 1  end_log_pos 1130 CRC32 XXX 	GTID 0-1-4
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 BEGIN
 /*!*/;
-# at 1056
-#<date> server id 1  end_log_pos 1112 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 1112
-#<date> server id 1  end_log_pos 1180 CRC32 XXX 	Write_rows: table id 30 flags: STMT_END_F
+# at 1130
+# at 1206
+#<date> server id 1  end_log_pos 1206 CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL)
+#<date> server id 1  end_log_pos 1262 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 1262
+#<date> server id 1  end_log_pos 1330 CRC32 XXX 	Write_rows: table id 30 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=11 /* INT meta=0 nullable=0 is_null=0 */
@@ -93,20 +99,23 @@ BEGIN
 ###   @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 1180
-#<date> server id 1  end_log_pos 1253 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 1330
+#<date> server id 1  end_log_pos 1403 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1253
-#<date> server id 1  end_log_pos 1295 CRC32 XXX 	GTID 0-1-5
+# at 1403
+#<date> server id 1  end_log_pos 1445 CRC32 XXX 	GTID 0-1-5
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 BEGIN
 /*!*/;
-# at 1295
-#<date> server id 1  end_log_pos 1351 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 1351
-#<date> server id 1  end_log_pos 1418 CRC32 XXX 	Write_rows: table id 30 flags: STMT_END_F
+# at 1445
+# at 1523
+#<date> server id 1  end_log_pos 1523 CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A")
+#<date> server id 1  end_log_pos 1579 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 1579
+#<date> server id 1  end_log_pos 1646 CRC32 XXX 	Write_rows: table id 30 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=12 /* INT meta=0 nullable=0 is_null=0 */
@@ -118,20 +127,23 @@ BEGIN
 ###   @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 1418
-#<date> server id 1  end_log_pos 1491 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 1646
+#<date> server id 1  end_log_pos 1719 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1491
-#<date> server id 1  end_log_pos 1533 CRC32 XXX 	GTID 0-1-6
+# at 1719
+#<date> server id 1  end_log_pos 1761 CRC32 XXX 	GTID 0-1-6
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 BEGIN
 /*!*/;
-# at 1533
-#<date> server id 1  end_log_pos 1589 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 1589
-#<date> server id 1  end_log_pos 1659 CRC32 XXX 	Write_rows: table id 30 flags: STMT_END_F
+# at 1761
+# at 1836
+#<date> server id 1  end_log_pos 1836 CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A")
+#<date> server id 1  end_log_pos 1892 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 1892
+#<date> server id 1  end_log_pos 1962 CRC32 XXX 	Write_rows: table id 30 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
@@ -143,20 +155,23 @@ BEGIN
 ###   @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 1659
-#<date> server id 1  end_log_pos 1732 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 1962
+#<date> server id 1  end_log_pos 2035 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1732
-#<date> server id 1  end_log_pos 1774 CRC32 XXX 	GTID 0-1-7
+# at 2035
+#<date> server id 1  end_log_pos 2077 CRC32 XXX 	GTID 0-1-7
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 BEGIN
 /*!*/;
-# at 1774
-#<date> server id 1  end_log_pos 1830 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
-# at 1830
-#<date> server id 1  end_log_pos 1997 CRC32 XXX 	Write_rows: table id 31 flags: STMT_END_F
+# at 2077
+# at 2131
+#<date> server id 1  end_log_pos 2131 CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t2 SELECT * FROM t1
+#<date> server id 1  end_log_pos 2187 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
+# at 2187
+#<date> server id 1  end_log_pos 2354 CRC32 XXX 	Write_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -201,20 +216,23 @@ BEGIN
 ###   @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 1997
-#<date> server id 1  end_log_pos 2070 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 2354
+#<date> server id 1  end_log_pos 2427 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2070
-#<date> server id 1  end_log_pos 2112 CRC32 XXX 	GTID 0-1-8
+# at 2427
+#<date> server id 1  end_log_pos 2469 CRC32 XXX 	GTID 0-1-8
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 BEGIN
 /*!*/;
-# at 2112
-#<date> server id 1  end_log_pos 2168 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
-# at 2168
-#<date> server id 1  end_log_pos 2242 CRC32 XXX 	Update_rows: table id 31 flags: STMT_END_F
+# at 2469
+# at 2535
+#<date> server id 1  end_log_pos 2535 CRC32 XXX 	Annotate_rows:
+#Q> UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL
+#<date> server id 1  end_log_pos 2591 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
+# at 2591
+#<date> server id 1  end_log_pos 2665 CRC32 XXX 	Update_rows: table id 31 flags: STMT_END_F
 ### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -233,20 +251,23 @@ BEGIN
 ###   @5=NULL /* INT meta=0 nullable=1 is_null=1 */
 ### SET
 ###   @5=5 /* INT meta=0 nullable=1 is_null=0 */
-# at 2242
-#<date> server id 1  end_log_pos 2315 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 2665
+#<date> server id 1  end_log_pos 2738 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2315
-#<date> server id 1  end_log_pos 2357 CRC32 XXX 	GTID 0-1-9
+# at 2738
+#<date> server id 1  end_log_pos 2780 CRC32 XXX 	GTID 0-1-9
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 BEGIN
 /*!*/;
-# at 2357
-#<date> server id 1  end_log_pos 2413 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 2413
-#<date> server id 1  end_log_pos 2467 CRC32 XXX 	Delete_rows: table id 30 flags: STMT_END_F
+# at 2780
+# at 2817
+#<date> server id 1  end_log_pos 2817 CRC32 XXX 	Annotate_rows:
+#Q> DELETE FROM t1
+#<date> server id 1  end_log_pos 2873 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 2873
+#<date> server id 1  end_log_pos 2927 CRC32 XXX 	Delete_rows: table id 30 flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -259,20 +280,23 @@ BEGIN
 ### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
-# at 2467
-#<date> server id 1  end_log_pos 2540 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 2927
+#<date> server id 1  end_log_pos 3000 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2540
-#<date> server id 1  end_log_pos 2582 CRC32 XXX 	GTID 0-1-10
+# at 3000
+#<date> server id 1  end_log_pos 3042 CRC32 XXX 	GTID 0-1-10
 /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
 BEGIN
 /*!*/;
-# at 2582
-#<date> server id 1  end_log_pos 2638 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
-# at 2638
-#<date> server id 1  end_log_pos 2692 CRC32 XXX 	Delete_rows: table id 31 flags: STMT_END_F
+# at 3042
+# at 3079
+#<date> server id 1  end_log_pos 3079 CRC32 XXX 	Annotate_rows:
+#Q> DELETE FROM t2
+#<date> server id 1  end_log_pos 3135 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
+# at 3135
+#<date> server id 1  end_log_pos 3189 CRC32 XXX 	Delete_rows: table id 31 flags: STMT_END_F
 ### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -285,13 +309,13 @@ BEGIN
 ### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
-# at 2692
-#<date> server id 1  end_log_pos 2765 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 3189
+#<date> server id 1  end_log_pos 3262 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2765
-#<date> server id 1  end_log_pos 2813 CRC32 XXX 	Rotate to master-bin.000002  pos: 4
+# at 3262
+#<date> server id 1  end_log_pos 3310 CRC32 XXX 	Rotate to master-bin.000002  pos: 4
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;

mysql-test/r/mysqld--help.result

@@ -33,6 +33,7 @@ The following options may be given as the first argument:
  --binlog-annotate-row-events 
  Tells the master to annotate RBR events with the
  statement that caused these events
+ (Defaults to on; use --skip-binlog-annotate-row-events to disable.)
  --binlog-cache-size=# 
  The size of the transactional cache for updates to
  transactional engines for the binary log. If you often
@@ -238,7 +239,7 @@ The following options may be given as the first argument:
  prefixes.
  (Defaults to on; use --skip-getopt-prefix-matching to disable.)
  --group-concat-max-len=# 
- The maximum length of the result of function 
+ The maximum length of the result of function
  GROUP_CONCAT()
  --gtid-domain-id=#  Used with global transaction ID to identify logically
  independent replication streams. When events can
@@ -379,6 +380,7 @@ The following options may be given as the first argument:
  --log-slow-admin-statements 
  Log slow OPTIMIZE, ANALYZE, ALTER and other
  administrative statements to the slow log if it is open.
+ (Defaults to on; use --skip-log-slow-admin-statements to disable.)
  --log-slow-filter=name 
  Log only certain types of queries. Any combination of: 
  admin, filesort, filesort_on_disk, full_join, full_scan, 
@@ -391,6 +393,7 @@ The following options may be given as the first argument:
  --log-slow-slave-statements 
  Log slow statements executed by slave thread to the slow
  log if it is open.
+ (Defaults to on; use --skip-log-slow-slave-statements to disable.)
  --log-slow-verbosity=name 
  Verbosity level for the slow log. Any combination of: 
  innodb, query_plan, explain
@@ -820,6 +823,7 @@ The following options may be given as the first argument:
  Tells the slave to write annotate rows events received
  from the master to its own binary log. Ignored if
  log_slave_updates is not set
+ (Defaults to on; use --skip-replicate-annotate-row-events to disable.)
  --replicate-do-db=name 
  Tells the slave thread to restrict replication to the
  specified database. To specify more than one database,
@@ -1190,15 +1194,15 @@ automatic-sp-privileges TRUE
 back-log 80
 big-tables FALSE
 bind-address (No default value)
-binlog-annotate-row-events FALSE
+binlog-annotate-row-events TRUE
 binlog-cache-size 32768
 binlog-checksum CRC32
 binlog-commit-wait-count 0
 binlog-commit-wait-usec 100000
 binlog-direct-non-transactional-updates FALSE
-binlog-format STATEMENT
+binlog-format MIXED
 binlog-optimize-thread-scheduling TRUE
-binlog-row-event-max-size 1024
+binlog-row-event-max-size 8192
 binlog-row-image FULL
 binlog-stmt-cache-size 32768
 bulk-insert-buffer-size 8388608
@@ -1247,7 +1251,7 @@ ft-stopword-file (No default value)
 gdb FALSE
 general-log FALSE
 getopt-prefix-matching TRUE
-group-concat-max-len 1024
+group-concat-max-len 1048576
 gtid-domain-id 0
 gtid-ignore-duplicates FALSE
 gtid-strict-mode FALSE
@@ -1277,7 +1281,7 @@ lc-messages en_US
 lc-messages-dir MYSQL_SHAREDIR/
 lc-time-names en_US
 local-infile TRUE
-lock-wait-timeout 31536000
+lock-wait-timeout 86400
 log-bin (No default value)
 log-bin-compress FALSE
 log-bin-compress-min-len 256
@@ -1289,20 +1293,20 @@ log-output FILE
 log-queries-not-using-indexes FALSE
 log-short-format FALSE
 log-slave-updates FALSE
-log-slow-admin-statements FALSE
+log-slow-admin-statements TRUE
 log-slow-filter admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
 log-slow-rate-limit 1
-log-slow-slave-statements FALSE
+log-slow-slave-statements TRUE
 log-slow-verbosity 
 log-tc tc.log
-log-warnings 1
+log-warnings 2
 long-query-time 10
 low-priority-updates FALSE
 lower-case-table-names 1
 master-info-file master.info
 master-retry-count 86400
 master-verify-checksum FALSE
-max-allowed-packet 4194304
+max-allowed-packet 16777216
 max-binlog-cache-size 18446744073709547520
 max-binlog-size 1073741824
 max-binlog-stmt-cache-size 18446744073709547520
@@ -1314,7 +1318,7 @@ max-error-count 64
 max-heap-table-size 16777216
 max-join-size 18446744073709551615
 max-length-for-sort-data 1024
-max-long-data-size 4194304
+max-long-data-size 16777216
 max-prepared-stmt-count 16382
 max-recursive-iterations 18446744073709551615
 max-relay-log-size 1073741824
@@ -1336,7 +1340,7 @@ myisam-block-size 1024
 myisam-data-pointer-size 6
 myisam-max-sort-file-size 9223372036853727232
 myisam-mmap-size 18446744073709551615
-myisam-recover-options DEFAULT
+myisam-recover-options BACKUP,QUICK
 myisam-repair-threads 1
 myisam-sort-buffer-size 134216704
 myisam-stats-method NULLS_UNEQUAL
@@ -1427,7 +1431,7 @@ relay-log-info-file relay-log.info
 relay-log-purge TRUE
 relay-log-recovery FALSE
 relay-log-space-limit 0
-replicate-annotate-row-events FALSE
+replicate-annotate-row-events TRUE
 replicate-events-marked-for-skip REPLICATE
 replicate-same-server-id FALSE
 report-host (No default value)
@@ -1455,7 +1459,7 @@ slave-ddl-exec-mode IDEMPOTENT
 slave-domain-parallel-threads 0
 slave-exec-mode STRICT
 slave-max-allowed-packet 1073741824
-slave-net-timeout 3600
+slave-net-timeout 60
 slave-parallel-max-queued 131072
 slave-parallel-mode conservative
 slave-parallel-threads 0
@@ -1474,7 +1478,7 @@ standard-compliant-cte TRUE
 stored-program-cache 256
 strict-password-validation TRUE
 symbolic-links FALSE
-sync-binlog 0
+sync-binlog 1
 sync-frm FALSE
 sync-master-info 10000
 sync-relay-log 10000

mysql-test/r/order_by.result

+call mtr.add_suppression("Sort aborted.*");
 drop table if exists t1,t2,t3;
 call mtr.add_suppression("Out of sort memory; increase server sort buffer size");
 CREATE TABLE t1 (

mysql-test/r/partition_innodb.result

+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
 set global default_storage_engine='innodb';
 set session default_storage_engine='innodb';
 drop table if exists t1, t2;

mysql-test/r/partition_innodb_plugin.result

 call mtr.add_suppression("InnoDB: Table .* does not exist in the InnoDB internal data dictionary .*");
+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
 #
 # Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB,
 #                         PARTITONING, ON INDEX CREATE

mysql-test/r/row-checksum-old.result

@@ -71,17 +71,15 @@ checksum table t1 extended;
 Table	Checksum
 test.t1	4108368782
 drop table if exists t1;
-create table t1 (a int null, v varchar(100)) engine=innodb checksum=0 row_format=fixed;
-Warnings:
-Warning	1478	InnoDB: assuming ROW_FORMAT=DYNAMIC.
+create table t1 (a int null, v varchar(100)) engine=innodb checksum=0 row_format=compact;
 insert into t1 values(null, null), (1, "hello");
 checksum table t1;
 Table	Checksum
-test.t1	4108368782
+test.t1	452555338
 checksum table t1 quick;
 Table	Checksum
 test.t1	NULL
 checksum table t1 extended;
 Table	Checksum
-test.t1	4108368782
+test.t1	452555338
 drop table t1;

mysql-test/r/row-checksum.result

@@ -71,17 +71,15 @@ checksum table t1 extended;
 Table	Checksum
 test.t1	3885665021
 drop table if exists t1;
-create table t1 (a int null, v varchar(100)) engine=innodb checksum=0 row_format=fixed;
-Warnings:
-Warning	1478	InnoDB: assuming ROW_FORMAT=DYNAMIC.
+create table t1 (a int null, v varchar(100)) engine=innodb checksum=0 row_format=compact;
 insert into t1 values(null, null), (1, "hello");
 checksum table t1;
 Table	Checksum
-test.t1	3885665021
+test.t1	229851577
 checksum table t1 quick;
 Table	Checksum
 test.t1	NULL
 checksum table t1 extended;
 Table	Checksum
-test.t1	3885665021
+test.t1	229851577
 drop table t1;

mysql-test/r/set_statement_debug.result

+call mtr.add_suppression("Sort aborted.*");
 set @save_debug_dbug= @@debug_dbug;
 set statement  debug_dbug="d,something" for select @@debug_dbug;
 @@debug_dbug

mysql-test/r/subselect.result

 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t11,t12;
 drop view if exists v2;
+call mtr.add_suppression("Sort aborted.*");
 set @subselect_tmp=@@optimizer_switch;
 set @@optimizer_switch=ifnull(@optimizer_switch_for_subselect_test,
 "semijoin=on,firstmatch=on,loosescan=on,semijoin_with_cache=on,partial_match_rowid_merge=off,partial_match_table_scan=off");

mysql-test/r/subselect_no_exists_to_in.result

@@ -4,6 +4,7 @@ select @@optimizer_switch like '%exists_to_in=off%';
 set optimizer_switch='exists_to_in=off';
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t11,t12;
 drop view if exists v2;
+call mtr.add_suppression("Sort aborted.*");
 set @subselect_tmp=@@optimizer_switch;
 set @@optimizer_switch=ifnull(@optimizer_switch_for_subselect_test,
 "semijoin=on,firstmatch=on,loosescan=on,semijoin_with_cache=on,partial_match_rowid_merge=off,partial_match_table_scan=off");

mysql-test/r/subselect_no_mat.result

@@ -7,6 +7,7 @@ set join_cache_level=1;
 set @join_cache_level_for_subselect_test=@@join_cache_level;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t11,t12;
 drop view if exists v2;
+call mtr.add_suppression("Sort aborted.*");
 set @subselect_tmp=@@optimizer_switch;
 set @@optimizer_switch=ifnull(@optimizer_switch_for_subselect_test,
 "semijoin=on,firstmatch=on,loosescan=on,semijoin_with_cache=on,partial_match_rowid_merge=off,partial_match_table_scan=off");

mysql-test/r/subselect_no_opts.result

@@ -3,6 +3,7 @@ set join_cache_level=1;
 set @join_cache_level_for_subselect_test=@@join_cache_level;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t11,t12;
 drop view if exists v2;
+call mtr.add_suppression("Sort aborted.*");
 set @subselect_tmp=@@optimizer_switch;
 set @@optimizer_switch=ifnull(@optimizer_switch_for_subselect_test,
 "semijoin=on,firstmatch=on,loosescan=on,semijoin_with_cache=on,partial_match_rowid_merge=off,partial_match_table_scan=off");

mysql-test/r/subselect_no_scache.result

@@ -6,6 +6,7 @@ set join_cache_level=1;
 set @join_cache_level_for_subselect_test=@@join_cache_level;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t11,t12;
 drop view if exists v2;
+call mtr.add_suppression("Sort aborted.*");
 set @subselect_tmp=@@optimizer_switch;
 set @@optimizer_switch=ifnull(@optimizer_switch_for_subselect_test,
 "semijoin=on,firstmatch=on,loosescan=on,semijoin_with_cache=on,partial_match_rowid_merge=off,partial_match_table_scan=off");

mysql-test/r/subselect_no_semijoin.result

@@ -3,6 +3,7 @@ set join_cache_level=1;
 set @join_cache_level_for_subselect_test=@@join_cache_level;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t11,t12;
 drop view if exists v2;
+call mtr.add_suppression("Sort aborted.*");
 set @subselect_tmp=@@optimizer_switch;
 set @@optimizer_switch=ifnull(@optimizer_switch_for_subselect_test,
 "semijoin=on,firstmatch=on,loosescan=on,semijoin_with_cache=on,partial_match_rowid_merge=off,partial_match_table_scan=off");

mysql-test/r/union.result

@@ -1373,7 +1373,7 @@ t3	CREATE TABLE `t3` (
 drop tables t1,t2,t3;
 SELECT @tmp_max:= @@global.max_allowed_packet;
 @tmp_max:= @@global.max_allowed_packet
-4194304
+16777216
 SET @@global.max_allowed_packet=25000000;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '25000000'

mysql-test/r/variables.result

@@ -1278,12 +1278,12 @@ ERROR HY000: Variable 'lower_case_table_names' is a read only variable
 #
 SHOW VARIABLES like 'myisam_recover_options';
 Variable_name	Value
-myisam_recover_options	DEFAULT
+myisam_recover_options	BACKUP,QUICK
 SELECT @@session.myisam_recover_options;
 ERROR HY000: Variable 'myisam_recover_options' is a GLOBAL variable
 SELECT @@global.myisam_recover_options;
 @@global.myisam_recover_options
-DEFAULT
+BACKUP,QUICK
 SET @@session.myisam_recover_options= 'x';
 ERROR HY000: Variable 'myisam_recover_options' is a read only variable
 SET @@global.myisam_recover_options= 'x';
@@ -1532,7 +1532,7 @@ SET @@global.key_buffer_size=@kbs;
 SET @@global.key_cache_block_size=@kcbs;
 select @@max_long_data_size;
 @@max_long_data_size
-4194304
+16777216
 #
 # Bug#11766424  59527:
 # Assert in DECIMAL_BIN_SIZE: 

mysql-test/r/xa.result

+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
 drop table if exists t1, t2;
 create table t1 (a int) engine=innodb;
 xa start 'test1';

mysql-test/suite/archive/repair.result

+call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");
 create table t1 (a int) engine=archive;
 insert into t1 values (1);
 select * from t1;

mysql-test/suite/archive/repair.test

@@ -4,6 +4,8 @@
 
 --source include/have_archive.inc
 
+call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");
+
 --let $datadir = `SELECT @@datadir`
 
 create table t1 (a int) engine=archive;

mysql-test/suite/binlog/r/binlog_checkpoint.result

@@ -65,6 +65,7 @@ master-bin.000001	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 master-bin.000001	#	Gtid_list	#	#	[]
 master-bin.000001	#	Binlog_checkpoint	#	#	master-bin.000001
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (20, REPEAT("x", 4100))
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -75,6 +76,7 @@ master-bin.000002	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 master-bin.000002	#	Gtid_list	#	#	[#-#-#]
 master-bin.000002	#	Binlog_checkpoint	#	#	master-bin.000001
 master-bin.000002	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000002	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (21, REPEAT("x", 4100))
 master-bin.000002	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000002	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000002	#	Xid	#	#	COMMIT /* XID */

mysql-test/suite/binlog/r/binlog_database.result

@@ -228,12 +228,14 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	insert into t1 values (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	drop database if exists mysqltest1
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	insert into t1 values (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT

mysql-test/suite/binlog/r/binlog_implicit_commit.result

@@ -138,6 +138,7 @@ SET AUTOCOMMIT = 1;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -151,6 +152,7 @@ SET AUTOCOMMIT = 1;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -158,10 +160,12 @@ INSERT INTO t1 VALUES (3);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (3)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -169,10 +173,12 @@ COMMIT;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (3)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -183,6 +189,7 @@ INSERT INTO t1 VALUES (1);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -190,6 +197,7 @@ SET AUTOCOMMIT = 1;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -207,8 +215,10 @@ COMMIT;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (3)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -233,8 +243,10 @@ COMMIT;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (3)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -245,6 +257,7 @@ INSERT INTO t1 VALUES (1);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -252,6 +265,7 @@ SET AUTOCOMMIT = 0;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -269,8 +283,10 @@ COMMIT;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (3)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -283,6 +299,7 @@ LOCK TABLES t1 WRITE;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -290,6 +307,7 @@ INSERT INTO t1 VALUES (2);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -297,10 +315,12 @@ UNLOCK TABLES;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -308,10 +328,12 @@ COMMIT;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */

mysql-test/suite/binlog/r/binlog_innodb.result

@@ -74,6 +74,7 @@ master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t1 SET b = 2*a WHERE a > 1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	UPDATE t1 SET b = a * a WHERE a > 3
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Update_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -84,10 +85,12 @@ master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t1 SET b = 4*a WHERE a > 4
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	UPDATE t1 SET b = 1*a WHERE a > 1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Update_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	UPDATE t1 SET b = 2*a WHERE a > 2
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Update_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -98,18 +101,22 @@ master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t1 SET b = 4*a WHERE a > 4
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	UPDATE t1 SET b = 1*a WHERE a > 1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Update_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	UPDATE t1 SET b = 2*a WHERE a > 2
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Update_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	UPDATE t1 SET b = 3*a WHERE a > 3
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Update_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	UPDATE t1 SET b = 4*a WHERE a > 4
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Update_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */

mysql-test/suite/binlog/r/binlog_innodb_row.result

@@ -10,6 +10,7 @@ commit;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	insert into t1 values (1),(2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -25,6 +26,7 @@ commit;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	insert into t1 values (1),(2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -43,6 +45,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 ( c1 int , primary key (c1)) ENGINE=InnoDB
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1), (2), (3)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */

mysql-test/suite/binlog/r/binlog_mdev342.result

@@ -32,6 +32,7 @@ master-bin.000001	#	Binlog_checkpoint	#	#	master-bin.000001
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES (1, REPEAT("x", 4100))
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */

mysql-test/suite/binlog/r/binlog_mixed_load_data.result

@@ -4,6 +4,7 @@ LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT

mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result

@@ -175,6 +175,9 @@ c2 VARCHAR(20)
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t1 VALUES (1,'varchar-1'), (2,'varchar-2'), (3,'varchar-3')
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t1` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Write_rows: table id # flags: STMT_END_F
@@ -191,6 +194,9 @@ 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 # CRC32 XXX 	Annotate_rows:
+#Q> UPDATE t1 SET c1 = c1 + 10
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t1` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Update_rows: table id # flags: STMT_END_F
@@ -216,6 +222,9 @@ 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 # CRC32 XXX 	Annotate_rows:
+#Q> DELETE FROM t1 WHERE c1 = 12
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t1` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Delete_rows: table id # flags: STMT_END_F
@@ -248,6 +257,9 @@ TRUNCATE TABLE t1
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t2 VALUES (1,'varchar-1'), (2,'varchar-2'), (3,'varchar-3')
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t2` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Write_rows: table id # flags: STMT_END_F
@@ -274,6 +286,9 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Annotate_rows:
+#Q> UPDATE t2 SET c1 = c1 + 10
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t2` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Update_rows: table id # flags: STMT_END_F
@@ -309,6 +324,9 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Annotate_rows:
+#Q> DELETE FROM t2 WHERE c1 = 12
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t2` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Delete_rows: table id # flags: STMT_END_F
@@ -327,6 +345,9 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t1 VALUES (1,'varchar-1'), (2,'varchar-2'), (3,'varchar-3')
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t1` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Write_rows: table id # flags: STMT_END_F
@@ -343,6 +364,9 @@ 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 # CRC32 XXX 	Annotate_rows:
+#Q> UPDATE t1 SET c1 = c1 + 10
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t1` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Update_rows: table id # flags: STMT_END_F
@@ -368,6 +392,9 @@ 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 # CRC32 XXX 	Annotate_rows:
+#Q> DELETE FROM t1 WHERE c1 = 12
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t1` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Delete_rows: table id # flags: STMT_END_F
@@ -400,6 +427,9 @@ TRUNCATE TABLE t2
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t2 VALUES (1,'varchar-1'), (2,'varchar-2'), (3,'varchar-3')
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t2` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Write_rows: table id # flags: STMT_END_F
@@ -426,6 +456,9 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Annotate_rows:
+#Q> UPDATE t2 SET c1 = c1 + 10
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t2` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Update_rows: table id # flags: STMT_END_F
@@ -461,6 +494,9 @@ COMMIT
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Annotate_rows:
+#Q> DELETE FROM t2 WHERE c1 = 12
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Table_map: `test`.`t2` mapped to number #
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Delete_rows: table id # flags: STMT_END_F

mysql-test/suite/binlog/r/binlog_row_annotate.result

@@ -42,28 +42,35 @@ FLUSH LOGS;
 #####################################################################################
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	CREATE DATABASE test1
-master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	CREATE DATABASE test2
-master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	CREATE DATABASE test3
-master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
-master-bin.000001	#	Table_map	#	#	table_id: # (test1.t1)
-master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
-master-bin.000001	#	Annotate_rows	#	#	INSERT INTO test2.t2 VALUES (1), (2), (3)
-master-bin.000001	#	Table_map	#	#	table_id: # (test2.t2)
-master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
-master-bin.000001	#	Annotate_rows	#	#	INSERT INTO test3.t3 VALUES (1), (2), (3)
-master-bin.000001	#	Table_map	#	#	table_id: # (test3.t3)
-master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
-master-bin.000001	#	Annotate_rows	#	#	DELETE test1.t1, test2.t2
+master-bin.000001	#	Gtid	1	#	GTID 0-1-1
+master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS test1
+master-bin.000001	#	Gtid	1	#	GTID 0-1-2
+master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS test2
+master-bin.000001	#	Gtid	1	#	GTID 0-1-3
+master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS test3
+master-bin.000001	#	Gtid	1	#	GTID 0-1-4
+master-bin.000001	#	Query	1	#	CREATE DATABASE test1
+master-bin.000001	#	Gtid	1	#	GTID 0-1-5
+master-bin.000001	#	Query	1	#	CREATE DATABASE test2
+master-bin.000001	#	Gtid	1	#	GTID 0-1-6
+master-bin.000001	#	Query	1	#	CREATE DATABASE test3
+master-bin.000001	#	Gtid	1	#	BEGIN GTID 0-1-7
+master-bin.000001	#	Annotate_rows	1	#	INSERT INTO test1.t1 VALUES (1), (2), (3)
+master-bin.000001	#	Table_map	1	#	table_id: # (test1.t1)
+master-bin.000001	#	Write_rows_v1	1	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	1	#	COMMIT
+master-bin.000001	#	Gtid	1	#	BEGIN GTID 0-1-8
+master-bin.000001	#	Annotate_rows	1	#	INSERT INTO test2.t2 VALUES (1), (2), (3)
+master-bin.000001	#	Table_map	1	#	table_id: # (test2.t2)
+master-bin.000001	#	Write_rows_v1	1	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	1	#	COMMIT
+master-bin.000001	#	Gtid	1	#	BEGIN GTID 0-1-9
+master-bin.000001	#	Annotate_rows	1	#	INSERT INTO test3.t3 VALUES (1), (2), (3)
+master-bin.000001	#	Table_map	1	#	table_id: # (test3.t3)
+master-bin.000001	#	Write_rows_v1	1	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	1	#	COMMIT
+master-bin.000001	#	Gtid	1	#	BEGIN GTID 0-1-10
+master-bin.000001	#	Annotate_rows	1	#	DELETE test1.t1, test2.t2
 FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
 WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3.a
 master-bin.000001	#	Table_map	#	#	table_id: # (test1.t1)
@@ -146,6 +153,9 @@ CREATE DATABASE test3
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
+#Q> INSERT INTO test1.t1 VALUES (1), (2), (3)
 #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
@@ -367,6 +377,9 @@ CREATE DATABASE test1
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
+#Q> INSERT INTO test1.t1 VALUES (1), (2), (3)
 #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
@@ -531,6 +544,7 @@ 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
@@ -750,6 +764,9 @@ CREATE DATABASE test3
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
+#Q> INSERT INTO test1.t1 VALUES (1), (2), (3)
 #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
@@ -971,6 +988,9 @@ CREATE DATABASE test1
 BEGIN
 /*!*/;
 # at #
+# at #
+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:
+#Q> INSERT INTO test1.t1 VALUES (1), (2), (3)
 #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

mysql-test/suite/binlog/r/binlog_row_drop_tbl.result

@@ -20,6 +20,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES(1)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT

mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result

@@ -61,6 +61,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 ( i text )
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	INSERT INTO t1 VALUES ('1')
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT