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

1 files changed, 87 insertions, 63 deletions

diff --git a/mysql-test/r/mysqlbinlog_row_compressed.result b/mysql-test/r/mysqlbinlog_row_compressed.result
index a612433fc2f..e30557e08fa 100644
--- a/mysql-test/r/mysqlbinlog_row_compressed.result
+++ b/mysql-test/r/mysqlbinlog_row_compressed.result
@@ -56,9 +56,12 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN
 BEGIN
 /*!*/;
 # at 769
-#<date> server id 1  end_log_pos 825 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 825
-#<date> server id 1  end_log_pos 893 CRC32 XXX 	Write_compressed_rows: table id 30 flags: STMT_END_F
+# at 843
+#<date> server id 1  end_log_pos 843 CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "")
+#<date> server id 1  end_log_pos 899 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 899
+#<date> server id 1  end_log_pos 967 CRC32 XXX 	Write_compressed_rows: table id 30 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -70,20 +73,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 893
-#<date> server id 1  end_log_pos 966 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 967
+#<date> server id 1  end_log_pos 1040 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 966
-#<date> server id 1  end_log_pos 1008 CRC32 XXX 	GTID 0-1-4
+# at 1040
+#<date> server id 1  end_log_pos 1082 CRC32 XXX 	GTID 0-1-4
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 BEGIN
 /*!*/;
-# at 1008
-#<date> server id 1  end_log_pos 1064 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 1064
-#<date> server id 1  end_log_pos 1131 CRC32 XXX 	Write_compressed_rows: table id 30 flags: STMT_END_F
+# at 1082
+# at 1158
+#<date> server id 1  end_log_pos 1158 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 1214 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 1214
+#<date> server id 1  end_log_pos 1281 CRC32 XXX 	Write_compressed_rows: table id 30 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=11 /* INT meta=0 nullable=0 is_null=0 */
@@ -95,20 +101,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 1131
-#<date> server id 1  end_log_pos 1204 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 1281
+#<date> server id 1  end_log_pos 1354 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1204
-#<date> server id 1  end_log_pos 1246 CRC32 XXX 	GTID 0-1-5
+# at 1354
+#<date> server id 1  end_log_pos 1396 CRC32 XXX 	GTID 0-1-5
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 BEGIN
 /*!*/;
-# at 1246
-#<date> server id 1  end_log_pos 1302 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 1302
-#<date> server id 1  end_log_pos 1368 CRC32 XXX 	Write_compressed_rows: table id 30 flags: STMT_END_F
+# at 1396
+# at 1474
+#<date> server id 1  end_log_pos 1474 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 1530 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 1530
+#<date> server id 1  end_log_pos 1596 CRC32 XXX 	Write_compressed_rows: table id 30 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=12 /* INT meta=0 nullable=0 is_null=0 */
@@ -120,20 +129,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 1368
-#<date> server id 1  end_log_pos 1441 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 1596
+#<date> server id 1  end_log_pos 1669 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1441
-#<date> server id 1  end_log_pos 1483 CRC32 XXX 	GTID 0-1-6
+# at 1669
+#<date> server id 1  end_log_pos 1711 CRC32 XXX 	GTID 0-1-6
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 BEGIN
 /*!*/;
-# at 1483
-#<date> server id 1  end_log_pos 1539 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 1539
-#<date> server id 1  end_log_pos 1606 CRC32 XXX 	Write_compressed_rows: table id 30 flags: STMT_END_F
+# at 1711
+# at 1786
+#<date> server id 1  end_log_pos 1786 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 1842 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 1842
+#<date> server id 1  end_log_pos 1909 CRC32 XXX 	Write_compressed_rows: table id 30 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
@@ -145,20 +157,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 1606
-#<date> server id 1  end_log_pos 1679 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 1909
+#<date> server id 1  end_log_pos 1982 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1679
-#<date> server id 1  end_log_pos 1721 CRC32 XXX 	GTID 0-1-7
+# at 1982
+#<date> server id 1  end_log_pos 2024 CRC32 XXX 	GTID 0-1-7
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 BEGIN
 /*!*/;
-# at 1721
-#<date> server id 1  end_log_pos 1777 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
-# at 1777
-#<date> server id 1  end_log_pos 1868 CRC32 XXX 	Write_compressed_rows: table id 31 flags: STMT_END_F
+# at 2024
+# at 2078
+#<date> server id 1  end_log_pos 2078 CRC32 XXX 	Annotate_rows:
+#Q> INSERT INTO t2 SELECT * FROM t1
+#<date> server id 1  end_log_pos 2134 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
+# at 2134
+#<date> server id 1  end_log_pos 2225 CRC32 XXX 	Write_compressed_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -203,20 +218,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 1868
-#<date> server id 1  end_log_pos 1941 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 2225
+#<date> server id 1  end_log_pos 2298 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1941
-#<date> server id 1  end_log_pos 1983 CRC32 XXX 	GTID 0-1-8
+# at 2298
+#<date> server id 1  end_log_pos 2340 CRC32 XXX 	GTID 0-1-8
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 BEGIN
 /*!*/;
-# at 1983
-#<date> server id 1  end_log_pos 2039 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
-# at 2039
-#<date> server id 1  end_log_pos 2138 CRC32 XXX 	Update_compressed_rows: table id 31 flags: STMT_END_F
+# at 2340
+# at 2406
+#<date> server id 1  end_log_pos 2406 CRC32 XXX 	Annotate_rows:
+#Q> UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL
+#<date> server id 1  end_log_pos 2462 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
+# at 2462
+#<date> server id 1  end_log_pos 2561 CRC32 XXX 	Update_compressed_rows: table id 31 flags: STMT_END_F
 ### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -280,20 +298,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 2138
-#<date> server id 1  end_log_pos 2211 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 2561
+#<date> server id 1  end_log_pos 2634 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2211
-#<date> server id 1  end_log_pos 2253 CRC32 XXX 	GTID 0-1-9
+# at 2634
+#<date> server id 1  end_log_pos 2676 CRC32 XXX 	GTID 0-1-9
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 BEGIN
 /*!*/;
-# at 2253
-#<date> server id 1  end_log_pos 2309 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
-# at 2309
-#<date> server id 1  end_log_pos 2401 CRC32 XXX 	Delete_compressed_rows: table id 30 flags: STMT_END_F
+# at 2676
+# at 2713
+#<date> server id 1  end_log_pos 2713 CRC32 XXX 	Annotate_rows:
+#Q> DELETE FROM t1
+#<date> server id 1  end_log_pos 2769 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
+# at 2769
+#<date> server id 1  end_log_pos 2861 CRC32 XXX 	Delete_compressed_rows: table id 30 flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -338,20 +359,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 2401
-#<date> server id 1  end_log_pos 2474 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 2861
+#<date> server id 1  end_log_pos 2934 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2474
-#<date> server id 1  end_log_pos 2516 CRC32 XXX 	GTID 0-1-10
+# at 2934
+#<date> server id 1  end_log_pos 2976 CRC32 XXX 	GTID 0-1-10
 /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
 BEGIN
 /*!*/;
-# at 2516
-#<date> server id 1  end_log_pos 2572 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
-# at 2572
-#<date> server id 1  end_log_pos 2657 CRC32 XXX 	Delete_compressed_rows: table id 31 flags: STMT_END_F
+# at 2976
+# at 3013
+#<date> server id 1  end_log_pos 3013 CRC32 XXX 	Annotate_rows:
+#Q> DELETE FROM t2
+#<date> server id 1  end_log_pos 3069 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
+# at 3069
+#<date> server id 1  end_log_pos 3154 CRC32 XXX 	Delete_compressed_rows: table id 31 flags: STMT_END_F
 ### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -396,13 +420,13 @@ 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 2657
-#<date> server id 1  end_log_pos 2730 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
+# at 3154
+#<date> server id 1  end_log_pos 3227 CRC32 XXX 	Query	thread_id=4	exec_time=x	error_code=0
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2730
-#<date> server id 1  end_log_pos 2778 CRC32 XXX 	Rotate to master-bin.000002  pos: 4
+# at 3227
+#<date> server id 1  end_log_pos 3275 CRC32 XXX 	Rotate to master-bin.000002  pos: 4
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;