MDEV-7850: Extend GTID Binlog Events with Thread Id

This patch augments Gtid_log_event with the user thread-id.
In particular that compensates for the loss of this info in
Rows_log_events.

Gtid_log_event::thread_id gets visible in mysqlbinlog output like

  #231025 16:21:45 server id 1  end_log_pos 537 CRC32 0x1cf1d963  GTID 0-1-2 ddl thread_id=10

as 64 bit unsigned integer.

While the size of Gtid event has grown by 8-9 bytes
replication from OLD <-> NEW is not affected by it.

This work was started by the late Sujatha Sivakumar.
Brandon Nesterenko took it over, reviewed initial patches and extended
the work.

Reviewed-by: <andrei.elkin@mariadb.com>

mysql-test/include/binlog_parallel_replication_marks.test

@@ -80,6 +80,7 @@ while (<F>) {
   s/table id \d+/table id #/;
   s/mapped to number \d+/mapped to number #/;
   s/CRC32 0x[0-9a-f]+/CRC32 0x########/;
+  s/thread_id=\d+/thread_id=#/;
   print if /\b(GTID|START TRANSACTION|COMMIT|Table_map|Write_rows|Update_rows|Delete_rows|generated by server|40005 TEMPORARY)\b/;
 }
 close F;

mysql-test/main/mysqlbinlog_row_compressed.test

@@ -30,7 +30,7 @@ DELETE FROM t2;
 
 FLUSH BINARY LOGS;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/
+--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /thread_id=\d*/thread_id=TID/
 --exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
 
 --echo

mysql-test/main/mysqlbinlog_row_minimal.test

@@ -28,7 +28,7 @@ DELETE FROM t2;
 FLUSH BINARY LOGS;
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/
+--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /thread_id=\d*/thread_id=TID/
 --exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
 
 DROP TABLE t1,t2;

mysql-test/main/mysqlbinlog_stmt_compressed.result

@@ -23,16 +23,16 @@ ROLLBACK/*!*/;
 # at 285
 #<date> server id 1  end_log_pos 329 CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at 329
-#<date> server id 1  end_log_pos 371 CRC32 XXX 	GTID 0-1-1 ddl
+#<date> server id 1  end_log_pos 374 CRC32 XXX 	GTID 0-1-1 ddl thread_id=TID
 /*!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 371
-#<date> server id 1  end_log_pos 542 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 374
+#<date> server id 1  end_log_pos 545 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 use `test`/*!*/;
 SET TIMESTAMP=X/*!*/;
-SET @@session.pseudo_thread_id=5/*!*/;
+SET @@session.pseudo_thread_id=TID/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1, @@session.system_versioning_insert_history=0/*!*/;
 SET @@session.sql_mode=#/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
@@ -42,136 +42,136 @@ 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 542
-#<date> server id 1  end_log_pos 584 CRC32 XXX 	GTID 0-1-2 ddl
+# at 545
+#<date> server id 1  end_log_pos 590 CRC32 XXX 	GTID 0-1-2 ddl thread_id=TID
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
-# at 584
-#<date> server id 1  end_log_pos 745 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 590
+#<date> server id 1  end_log_pos 751 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 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 745
-#<date> server id 1  end_log_pos 787 CRC32 XXX 	GTID 0-1-3
+# at 751
+#<date> server id 1  end_log_pos 796 CRC32 XXX 	GTID 0-1-3 thread_id=TID
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
-# at 787
-#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 796
+#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "")
 /*!*/;
-# at 915
-#<date> server id 1  end_log_pos 988 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 924
+#<date> server id 1  end_log_pos 997 CRC32 XXX 	Query	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 988
-#<date> server id 1  end_log_pos 1030 CRC32 XXX 	GTID 0-1-4
+# at 997
+#<date> server id 1  end_log_pos 1042 CRC32 XXX 	GTID 0-1-4 thread_id=TID
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
-# at 1030
-#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 1042
+#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL)
 /*!*/;
-# at 1158
-#<date> server id 1  end_log_pos 1231 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 1170
+#<date> server id 1  end_log_pos 1243 CRC32 XXX 	Query	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1231
-#<date> server id 1  end_log_pos 1273 CRC32 XXX 	GTID 0-1-5
+# at 1243
+#<date> server id 1  end_log_pos 1288 CRC32 XXX 	GTID 0-1-5 thread_id=TID
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
-# at 1273
-#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 1288
+#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A")
 /*!*/;
-# at 1403
-#<date> server id 1  end_log_pos 1476 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 1418
+#<date> server id 1  end_log_pos 1491 CRC32 XXX 	Query	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1476
-#<date> server id 1  end_log_pos 1518 CRC32 XXX 	GTID 0-1-6
+# at 1491
+#<date> server id 1  end_log_pos 1536 CRC32 XXX 	GTID 0-1-6 thread_id=TID
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
-# at 1518
-#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 1536
+#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A")
 /*!*/;
-# at 1645
-#<date> server id 1  end_log_pos 1718 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 1663
+#<date> server id 1  end_log_pos 1736 CRC32 XXX 	Query	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1718
-#<date> server id 1  end_log_pos 1760 CRC32 XXX 	GTID 0-1-7
+# at 1736
+#<date> server id 1  end_log_pos 1781 CRC32 XXX 	GTID 0-1-7 thread_id=TID
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
-# at 1760
-#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 1781
+#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 INSERT INTO t2 SELECT * FROM t1
 /*!*/;
-# at 1868
-#<date> server id 1  end_log_pos 1941 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 1889
+#<date> server id 1  end_log_pos 1962 CRC32 XXX 	Query	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 1941
-#<date> server id 1  end_log_pos 1983 CRC32 XXX 	GTID 0-1-8
+# at 1962
+#<date> server id 1  end_log_pos 2007 CRC32 XXX 	GTID 0-1-8 thread_id=TID
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
-# at 1983
-#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 2007
+#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL
 /*!*/;
-# at 2100
-#<date> server id 1  end_log_pos 2173 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 2124
+#<date> server id 1  end_log_pos 2197 CRC32 XXX 	Query	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2173
-#<date> server id 1  end_log_pos 2215 CRC32 XXX 	GTID 0-1-9
+# at 2197
+#<date> server id 1  end_log_pos 2242 CRC32 XXX 	GTID 0-1-9 thread_id=TID
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
-# at 2215
-#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 2242
+#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 DELETE FROM t1
 /*!*/;
-# at 2306
-#<date> server id 1  end_log_pos 2379 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 2333
+#<date> server id 1  end_log_pos 2406 CRC32 XXX 	Query	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2379
-#<date> server id 1  end_log_pos 2421 CRC32 XXX 	GTID 0-1-10
+# at 2406
+#<date> server id 1  end_log_pos 2451 CRC32 XXX 	GTID 0-1-10 thread_id=TID
 /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
 START TRANSACTION
 /*!*/;
-# at 2421
-#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 2451
+#<date> server id 1  end_log_pos 0 CRC32 XXX 	Query_compressed	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 DELETE FROM t2
 /*!*/;
-# at 2512
-#<date> server id 1  end_log_pos 2585 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
+# at 2542
+#<date> server id 1  end_log_pos 2615 CRC32 XXX 	Query	thread_id=TID	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
 COMMIT
 /*!*/;
-# at 2585
-#<date> server id 1  end_log_pos 2633 CRC32 XXX 	Rotate to master-bin.000002  pos: 4
+# at 2615
+#<date> server id 1  end_log_pos 2663 CRC32 XXX 	Rotate to master-bin.000002  pos: 4
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;

mysql-test/main/mysqlbinlog_stmt_compressed.test

@@ -29,7 +29,7 @@ DELETE FROM t2;
 
 FLUSH BINARY LOGS;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/
+--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /thread_id=\d*/thread_id=TID/
 --exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
 
 --echo

mysql-test/main/mysqldump-max.test

@@ -1194,7 +1194,7 @@ source include/binlog_start_pos.inc;
 let _BINLOG_START_POS= $binlog_start_pos;
 --perl
 my $f= "$ENV{MYSQLTEST_VARDIR}/tmp/mwl136.sql";
-my $pos=$ENV{_BINLOG_START_POS} + 757;
+my $pos=$ENV{_BINLOG_START_POS} + 769;
 open F, '<', $f or die "Failed to open $f: $!\n";
 while (<F>) {
    s/$pos/<pos>/;

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

@@ -2260,7 +2260,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -2369,7 +2369,7 @@ crn INT -- row number
 ) ENGINE=InnoDB DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -2551,7 +2551,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -2733,7 +2733,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -3081,7 +3081,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -3421,7 +3421,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -3766,7 +3766,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -4109,7 +4109,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -4455,7 +4455,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-9 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-9 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -4635,7 +4635,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-10 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-10 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -4812,7 +4812,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-11 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-11 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=11*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -4992,7 +4992,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-12 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-12 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=12*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5270,7 +5270,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -5295,7 +5295,7 @@ crn INT -- row number
 ) ENGINE=InnoDB DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5365,7 +5365,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5444,7 +5444,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5671,7 +5671,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -5696,7 +5696,7 @@ c_1_n INT -- row number
 ) ENGINE=InnoDB DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -5709,7 +5709,7 @@ c_2_n INT -- row number
 ) ENGINE=InnoDB DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -5722,7 +5722,7 @@ c_3_n INT -- row number
 ) ENGINE=InnoDB DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5792,7 +5792,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5862,7 +5862,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5932,7 +5932,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -6122,7 +6122,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -6312,7 +6312,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -6337,7 +6337,7 @@ c3 VARCHAR(60)
 ) ENGINE=InnoDB DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 START TRANSACTION
 /*!*/;

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

@@ -2258,7 +2258,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -2367,7 +2367,7 @@ crn INT -- row number
 ) ENGINE=MyISAM DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -2551,7 +2551,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -2735,7 +2735,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -3085,7 +3085,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -3427,7 +3427,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -3774,7 +3774,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -4119,7 +4119,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -4467,7 +4467,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-9
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-9 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -4649,7 +4649,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-10
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-10 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -4828,7 +4828,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-11
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-11 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=11*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5010,7 +5010,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-12
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-12 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=12*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5290,7 +5290,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -5315,7 +5315,7 @@ crn INT -- row number
 ) ENGINE=MyISAM DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5387,7 +5387,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5468,7 +5468,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5697,7 +5697,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -5722,7 +5722,7 @@ c_1_n INT -- row number
 ) ENGINE=MyISAM DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -5735,7 +5735,7 @@ c_2_n INT -- row number
 ) ENGINE=MyISAM DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -5748,7 +5748,7 @@ c_3_n INT -- row number
 ) ENGINE=MyISAM DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5820,7 +5820,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5892,7 +5892,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -5964,7 +5964,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -6156,7 +6156,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -6348,7 +6348,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -6373,7 +6373,7 @@ c3 VARCHAR(60)
 ) ENGINE=MyISAM DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 START TRANSACTION
 /*!*/;

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

@@ -136,7 +136,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -160,7 +160,7 @@ c2 VARCHAR(20)
 ) ENGINE=InnoDB DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -172,7 +172,7 @@ c2 VARCHAR(20)
 ) ENGINE=MyISAM DEFAULT CHARSET latin1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -241,7 +241,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -249,7 +249,7 @@ SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -257,7 +257,7 @@ SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -287,7 +287,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-7 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -326,7 +326,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-8 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -348,7 +348,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-9 trans
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-9 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -417,7 +417,7 @@ START TRANSACTION
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-10 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-10 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -425,7 +425,7 @@ SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-11 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-11 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=11*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -433,7 +433,7 @@ SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t2
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-12
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-12 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=12*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -463,7 +463,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-13
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-13 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=13*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -502,7 +502,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-14
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-14 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=14*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -524,7 +524,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-15 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-15 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=15*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -532,7 +532,7 @@ SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-16 ddl
+#010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-16 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=16*//*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>

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

@@ -37,27 +37,27 @@ connect  tmp_con,localhost,root,,;
 disconnect tmp_con;
 connection default;
 FLUSH LOGS;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 #Q> /* GTID */ INSERT INTO t1 VALUES (1,0)
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
 # server id 1  end_log_pos # CRC32 0x######## 	Write_rows: table id # flags: STMT_END_F
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 #Q> /* GTID */ INSERT INTO t1 VALUES (2,0)
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
 # server id 1  end_log_pos # CRC32 0x######## 	Write_rows: table id # flags: STMT_END_F
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl thread_id=#
 /* GTID */ ALTER TABLE t1 ADD c INT
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 #Q> /* GTID */ INSERT INTO t1 VALUES (3,0,0)
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
 # server id 1  end_log_pos # CRC32 0x######## 	Write_rows: table id # flags: STMT_END_F
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 #Q> /* GTID */ UPDATE t1 SET b=1, c=1 WHERE a=2
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
@@ -69,7 +69,7 @@ START TRANSACTION
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
 # server id 1  end_log_pos # CRC32 0x######## 	Write_rows: table id # flags: STMT_END_F
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 #Q> /* GTID */ DELETE FROM t1 WHERE a=5
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
@@ -81,25 +81,25 @@ START TRANSACTION
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
 # server id 1  end_log_pos # CRC32 0x######## 	Update_rows: table id # flags: STMT_END_F
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 #Q> /* GTID */ INSERT INTO t1 VALUES (8, 5, 0)
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
 # server id 1  end_log_pos # CRC32 0x######## 	Write_rows: table id # flags: STMT_END_F
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 #Q> /* GTID */ INSERT INTO t1 VALUES (9, 5, 1)
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
 # server id 1  end_log_pos # CRC32 0x######## 	Write_rows: table id # flags: STMT_END_F
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 #Q> /* GTID */ INSERT INTO t1 VALUES (10, 6, 0)
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #
 # server id 1  end_log_pos # CRC32 0x######## 	Write_rows: table id # flags: STMT_END_F
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 #Q> /* GTID */ INSERT INTO t1 VALUES (11, 7, 0)
 # server id 1  end_log_pos # CRC32 0x######## 	Table_map: `test`.`t1` mapped to number #

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

@@ -37,21 +37,21 @@ connect  tmp_con,localhost,root,,;
 disconnect tmp_con;
 connection default;
 FLUSH LOGS;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 /* GTID */ INSERT INTO t1 VALUES (1,0)
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 /* GTID */ INSERT INTO t1 VALUES (2,0)
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl thread_id=#
 /* GTID */ ALTER TABLE t1 ADD c INT
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 /* GTID */ INSERT INTO t1 VALUES (3,0,0)
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl thread_id=#
 START TRANSACTION
 /* GTID */ UPDATE t1 SET b=1, c=1 WHERE a=2
 /* GTID */ CREATE TEMPORARY TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB
@@ -60,9 +60,9 @@ START TRANSACTION
 DROP TEMPORARY TABLE `t2` /* generated by server */
 /* GTID */ INSERT INTO t1 VALUES (6, 3, 0)
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl thread_id=#
 /* GTID */ CREATE TEMPORARY TABLE t3 (a INT PRIMARY KEY) ENGINE=InnoDB
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl thread_id=#
 START TRANSACTION
 /* GTID */ DELETE FROM t1 WHERE a=5
 /* GTID */ INSERT INTO t3 VALUES (7)
@@ -70,27 +70,27 @@ START TRANSACTION
 /* GTID */ UPDATE t1 SET c=1 WHERE a=7
 DROP TEMPORARY TABLE `t3` /* generated by server */
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl thread_id=#
 /* GTID */ CREATE TEMPORARY TABLE t4 (a INT PRIMARY KEY) ENGINE=InnoDB
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 /* GTID */ INSERT INTO t1 VALUES (8, 5, 0)
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl thread_id=#
 /* GTID */ ALTER TABLE t4 ADD b INT
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 /* GTID */ INSERT INTO t1 VALUES (9, 5, 1)
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# trans thread_id=#
 START TRANSACTION
 /* GTID */ INSERT INTO t1 VALUES (10, 6, 0)
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl thread_id=#
 START TRANSACTION
 /* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB
 /* GTID */ INSERT INTO t1 VALUES (11, 7, 0)
 COMMIT/*!*/;
-# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl
+# server id 1  end_log_pos # CRC32 0x######## 	GTID #-#-# ddl thread_id=#
 DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t5`
 DROP TABLE t1;

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

@@ -82,7 +82,7 @@ DELIMITER /*!*/;
 # at #
 #YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000003
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=#*//*!*/;
 /*!100001 SET @@session.server_id=#*//*!*/;
@@ -103,7 +103,7 @@ SET @@session.collation_database=DEFAULT/*!*/;
 CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8)
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -124,7 +124,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -145,7 +145,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -166,7 +166,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -187,7 +187,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -208,7 +208,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -229,7 +229,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 # at #
 #YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>

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

@@ -40,7 +40,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -60,7 +60,7 @@ SET @@session.collation_database=DEFAULT/*!*/;
 CREATE TABLE t1 (a INT, b INT)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-2
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-2 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -86,7 +86,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-3 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-3 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -95,7 +95,7 @@ SET TIMESTAMP=1000000000/*!*/;
 CREATE TABLE t2 (a INT)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-4
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-4 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -119,7 +119,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-5
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-5 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -141,7 +141,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-6 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-6 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 # at #
 use `new_test3`/*!*/;
@@ -150,7 +150,7 @@ SET TIMESTAMP=1000000000/*!*/;
 CREATE TABLE t3 (a INT)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-7
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-7 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -174,7 +174,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-8
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-8 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -196,7 +196,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-9
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-9 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -235,7 +235,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-10
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-10 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -281,7 +281,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -301,7 +301,7 @@ SET @@session.collation_database=DEFAULT/*!*/;
 CREATE TABLE t1 (a INT, b INT)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-2
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-2 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -327,7 +327,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-3 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-3 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -336,7 +336,7 @@ SET TIMESTAMP=1000000000/*!*/;
 CREATE TABLE t2 (a INT)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-4
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-4 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -360,7 +360,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-5
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-5 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -382,7 +382,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-6 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-6 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 # at #
 use `new_test3`/*!*/;
@@ -391,7 +391,7 @@ SET TIMESTAMP=1000000000/*!*/;
 CREATE TABLE t3 (a INT)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-7
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-7 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -415,7 +415,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-8
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-8 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -437,7 +437,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-9
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-9 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -476,7 +476,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-10
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-10 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
 START TRANSACTION
 /*!*/;

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

@@ -84,7 +84,7 @@ DELIMITER /*!*/;
 # at #
 #YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000003
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=#*//*!*/;
 /*!100001 SET @@session.server_id=#*//*!*/;
@@ -105,7 +105,7 @@ SET @@session.collation_database=DEFAULT/*!*/;
 CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8)
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -120,7 +120,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -136,7 +136,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -151,7 +151,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -166,7 +166,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -182,7 +182,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -197,7 +197,7 @@ SET TIMESTAMP=XXX/*!*/;
 COMMIT
 /*!*/;
 # at #
-#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl
+#YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=#*//*!*/;
 # at #
 #YYMMDD HH:MM:SS server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>

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

@@ -50,7 +50,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at #
-#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -79,7 +79,7 @@ c08 TEXT
 ) ENGINE=InnoDB
 /*!*/;
 # at #
-#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 trans
+#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-2 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -105,7 +105,7 @@ START TRANSACTION
 #010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans
+#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -131,7 +131,7 @@ START TRANSACTION
 #010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans
+#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -157,7 +157,7 @@ START TRANSACTION
 #010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 trans
+#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-5 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -211,7 +211,7 @@ START TRANSACTION
 #010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	Xid = #
 COMMIT/*!*/;
 # at #
-#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6 trans
+#010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	GTID 0-1-6 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;

mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test

@@ -58,20 +58,20 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
-let $start_pos= `select @binlog_start_pos + 705`;
+let $start_pos= `select @binlog_start_pos + 714`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
-let $stop_pos= `select @binlog_start_pos + 705`;
+let $stop_pos= `select @binlog_start_pos + 714`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 
 --disable_query_log
 select "--- start and stop positions ---" as "";
 --enable_query_log
-let $start_pos= `select @binlog_start_pos + 705`;
-let $stop_pos= `select @binlog_start_pos + 866`;
+let $start_pos= `select @binlog_start_pos + 714`;
+let $stop_pos= `select @binlog_start_pos + 878`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position=$stop_pos  $MYSQLD_DATADIR/master-bin.000001 
 --disable_query_log
@@ -103,13 +103,13 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
-let $start_pos= `select @binlog_start_pos + 705`;
+let $start_pos= `select @binlog_start_pos + 714`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
-let $stop_pos= `select @binlog_start_pos + 134`;
+let $stop_pos= `select @binlog_start_pos + 134 + 1*3`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
 --disable_query_log
@@ -138,20 +138,20 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
-let $start_pos= `select @binlog_start_pos + 705`;
+let $start_pos= `select @binlog_start_pos + 714`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
-let $stop_pos= `select @binlog_start_pos + 705`;
+let $stop_pos= `select @binlog_start_pos + 714`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
 --disable_query_log
 select "--- start and stop positions ---" as "";
 --enable_query_log
-let $start_pos= `select @binlog_start_pos + 705`;
-let $stop_pos= `select @binlog_start_pos + 812`;
+let $start_pos= `select @binlog_start_pos + 714`;
+let $stop_pos= `select @binlog_start_pos + 878`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position $stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
 --disable_query_log
@@ -180,13 +180,13 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
-let $start_pos= `select @binlog_start_pos + 705`;
+let $start_pos= `select @binlog_start_pos + 714`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001  master-bin.000002
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
-let $stop_pos= `select @binlog_start_pos + 109`;
+let $stop_pos= `select @binlog_start_pos + 109 + 1*3`;
 --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
 --exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001  master-bin.000002
 --disable_query_log

mysql-test/suite/binlog_encryption/binlog_row_annotate.result

@@ -111,7 +111,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-1 ddl
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -130,7 +130,7 @@ SET @@session.collation_database=DEFAULT/*!*/;
 CREATE DATABASE test1
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-2 ddl
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-2 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -138,7 +138,7 @@ SET TIMESTAMP=1000000000/*!*/;
 CREATE DATABASE test2
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-3 ddl
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-3 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -146,7 +146,7 @@ SET TIMESTAMP=1000000000/*!*/;
 CREATE DATABASE test3
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-4
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-4 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -173,7 +173,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-5
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-5 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -200,7 +200,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-6
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-6 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -227,7 +227,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-7
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-7 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -269,7 +269,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-8
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-8 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -296,7 +296,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-9
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-9 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -352,7 +352,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-1 ddl
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -371,15 +371,15 @@ SET @@session.collation_database=DEFAULT/*!*/;
 CREATE DATABASE test1
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-2 ddl
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-2 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at #
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-3 ddl
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-3 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 # at #
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-4
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-4 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -406,7 +406,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-5
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-5 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -419,7 +419,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-6
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-6 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -432,7 +432,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-7
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-7 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -462,7 +462,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-8
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-8 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -475,7 +475,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-9
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-9 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -514,7 +514,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # 	Binlog checkpoint master-bin.000001
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-1 ddl
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -533,7 +533,7 @@ SET @@session.collation_database=DEFAULT/*!*/;
 CREATE DATABASE test1
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-2 ddl
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-2 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -541,7 +541,7 @@ SET TIMESTAMP=1000000000/*!*/;
 CREATE DATABASE test2
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-3 ddl
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-3 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -549,7 +549,7 @@ SET TIMESTAMP=1000000000/*!*/;
 CREATE DATABASE test3
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-4
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-4 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -573,7 +573,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-5
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-5 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -597,7 +597,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-6
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-6 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -621,7 +621,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-7
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-7 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -658,7 +658,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-8
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-8 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -682,7 +682,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-9
+#010909  4:46:40 server id #  end_log_pos # 	GTID 0-1-9 thread_id=#
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;

mysql-test/suite/innodb/t/binlog_consistent.test

@@ -19,7 +19,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb;
 # MDEV-515 takes X-lock on the table for the first insert.
 # So concurrent insert won't happen on the table
 INSERT INTO t1 VALUES(9, "");
-let pos=`select $binlog_start_pos + 431`;
+let pos=`select $binlog_start_pos + 437`;
 --replace_result $pos <pos>
 SHOW MASTER STATUS;
 --replace_result $pos <pos>
@@ -56,10 +56,10 @@ COMMIT;
 
 connection default;
 SELECT * FROM t1 ORDER BY a,b;
-let pos=`select $binlog_start_pos + 974`;
+let pos=`select $binlog_start_pos + 989`;
 --replace_result $pos <pos>
 SHOW STATUS LIKE 'binlog_snapshot_%';
-let pos=`select $binlog_start_pos + 1350`;
+let pos=`select $binlog_start_pos + 1371`;
 --replace_result $pos <pos>
 SHOW MASTER STATUS;
 SELECT * FROM t2 ORDER BY a;
@@ -77,7 +77,7 @@ FLUSH LOGS;
 
 connection default;
 SELECT * FROM t1 ORDER BY a,b;
-let pos=`select $binlog_start_pos + 974`;
+let pos=`select $binlog_start_pos + 989`;
 --replace_result $pos <pos>
 SHOW STATUS LIKE 'binlog_snapshot_%';
 let pos=`select $binlog_start_pos + 131`;

mysql-test/suite/innodb/t/group_commit_binlog_pos.test

@@ -97,7 +97,7 @@ SELECT * FROM t1 ORDER BY a;
 # for the end of the second transaction (as can be checked with
 # mysqlbinlog).
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
-let pos=`select $binlog_start_pos + 739`;
+let pos=`select $binlog_start_pos + 763`;
 --replace_result $pos <pos>
 --exec sed -ne 's/.*\(InnoDB: Last binlog file .* position.*\)/\1/p' $MYSQLD_DATADIR/../../log/mysqld.1.err | tail -1
 

mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test

@@ -98,7 +98,7 @@ SELECT * FROM t1 ORDER BY a;
 # for the end of the second transaction (as can be checked with
 # mysqlbinlog).
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
-let pos=`select $binlog_start_pos + 739`;
+let pos=`select $binlog_start_pos + 763`;
 --replace_result $pos <pos>
 --exec sed -ne 's/.*\(InnoDB: Last binlog file .* position.*\)/\1/p' $MYSQLD_DATADIR/../../log/mysqld.1.err | tail -1
 SET DEBUG_SYNC= 'RESET';

mysql-test/suite/multi_source/multisource_for_channel.result

@@ -252,7 +252,7 @@ Slave_running	ON
 SHOW RELAYLOG EVENTS for channel 'master1';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 mysqld-relay-bin-master1.000003	4	Format_desc	3	256	Server ver: Version
-mysqld-relay-bin-master1.000003	256	Rotate	1	1358	master-bin.000002;pos=4
+mysqld-relay-bin-master1.000003	256	Rotate	1	1373	master-bin.000002;pos=4
 mysqld-relay-bin-master1.000003	304	Rotate	3	366	mysqld-relay-bin-master1.000004;pos=4
 
 show slave status for channel 'master1'

mysql-test/suite/multi_source/reset_slave.test

@@ -39,9 +39,9 @@ stop slave 'master1';
 
 --let $datadir = `SELECT @@datadir`
 
-let read_master_log_pos=`select $binlog_start_pos + 608`;
-let relay_log_pos=`select 2*$binlog_start_pos + 652`;
-let relay_log_space=`select 3*$binlog_start_pos + 714`;
+let read_master_log_pos=`select $binlog_start_pos + 617`;
+let relay_log_pos=`select 2*$binlog_start_pos + 661`;
+let relay_log_space=`select 3*$binlog_start_pos + 723`;
 
 --replace_result $SERVER_MYPORT_1 MYPORT_1 $read_master_log_pos <read_master_log_pos> $relay_log_pos <relay_log_pos> $relay_log_space <relay_log_space>
 show slave 'master1' status;

mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result

@@ -190,7 +190,7 @@ ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	Binlog checkpoint slave-bin.000001
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-1 ddl thread_id=#
 /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
 /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
 /*!100001 SET @@session.server_id=1*//*!*/;
@@ -210,7 +210,7 @@ SET @@session.collation_database=DEFAULT/*!*/;
 CREATE TABLE t1 (a INT, b INT, c INT)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-2 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-2 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -218,7 +218,7 @@ SET TIMESTAMP=1000000000/*!*/;
 CREATE TABLE t2 (a INT, b INT, c INT)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-2-3 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-2-3 ddl thread_id=#
 /*!100001 SET @@session.server_id=2*//*!*/;
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 # at #
@@ -227,7 +227,7 @@ SET TIMESTAMP=1000000000/*!*/;
 ALTER TABLE t1 ENGINE=BLACKHOLE
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-3 trans thread_id=#
 /*!100001 SET @@session.server_id=1*//*!*/;
 /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
@@ -246,7 +246,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-4 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -264,7 +264,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-5 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-5 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -282,7 +282,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-6 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-6 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -300,7 +300,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-7 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-7 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -318,7 +318,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-8 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-8 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -326,7 +326,7 @@ SET TIMESTAMP=1000000000/*!*/;
 ALTER TABLE t1 ADD PRIMARY KEY pk_t1 (a,b)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-9 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-9 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -344,7 +344,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-10 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-10 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -362,7 +362,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-11 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-11 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=11*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -380,7 +380,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-12 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-12 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=12*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>
@@ -388,7 +388,7 @@ SET TIMESTAMP=1000000000/*!*/;
 ALTER TABLE t1 DROP PRIMARY KEY, ADD KEY key_t1 (a)
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-13 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-13 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=13*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -406,7 +406,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-14 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-14 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=14*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -424,7 +424,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-15 trans
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-15 trans thread_id=#
 /*!100001 SET @@session.gtid_seq_no=15*//*!*/;
 START TRANSACTION
 /*!*/;
@@ -442,7 +442,7 @@ SET TIMESTAMP=1000000000/*!*/;
 COMMIT
 /*!*/;
 # at #
-#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-16 ddl
+#010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	GTID 0-1-16 ddl thread_id=#
 /*!100001 SET @@session.gtid_seq_no=16*//*!*/;
 # at #
 #010909  4:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0	xid=<xid>

mysql-test/suite/rpl/r/rpl_gtid_thread_id.result

+include/master-slave.inc
+[connection master]
+connection master;
+create table t1(a int);
+insert into t1 values(1);
+optimize table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	status	OK
+connection slave;
+connection master;
+# MYSQL_BINLOG local > primary_outfile
+include/assert_grep.inc [Ensure only 3 GTID events exist (Primary)]
+include/assert_grep.inc [Ensure each GTID event has the thread id (Primary)]
+#
+# GTID event's thread_id should not use psuedo_thread_id
+connection master;
+set @@pseudo_thread_id=99999;
+insert into t1 values(2);
+# MYSQL_BINLOG local > primary_outfile
+include/assert_grep.inc [GTID event's thread_id does not use pseudo_thread_id]
+#
+# Test the serial replica
+connection slave;
+# MYSQL_BINLOG local > replica_outfile
+include/assert_grep.inc [Ensure the same number of GTID events on the replica as the primary]
+include/assert_grep.inc [Ensure each GTID event has the thread id of the SQL Thread]
+#
+# Test the parallel replica
+connection slave;
+include/stop_slave.inc
+SET @@GLOBAL.slave_parallel_threads=1;
+include/start_slave.inc
+connection master;
+insert into t1 values(3);
+insert into t1 values(4);
+connection slave;
+connection slave;
+# MYSQL_BINLOG local > replica_outfile
+include/assert_grep.inc [Ensure the same number of GTID events on the replica as the primary]
+include/assert_grep.inc [Ensure only the new GTID events have the thread id of the worker thread]
+include/stop_slave.inc
+SET @@GLOBAL.slave_parallel_threads=0;
+include/start_slave.inc
+#
+# Cleanup
+connection master;
+drop table t1;
+include/rpl_end.inc

mysql-test/suite/rpl/t/rpl_gtid_thread_id.test

+#
+#   Verify that GTID log events are written into the binary log along with the
+# id of the thread which executed the transaction. On the primary, this is the
+# id of the user connection. On a replica, this is either the id of the SQL
+# Thread id, if serial, or the id of the corresponding worker thread, if
+# parallel. Psuedo_thread_id is disregarded and only used for Query log events.
+#
+# References:
+#   MDEV-7850:  MariaDB doesn't show thread_id for ROW-based events in binlog
+#
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--connection master
+--let primary_thread_id=`select connection_id()`
+create table t1(a int);
+insert into t1 values(1);
+optimize table t1;
+
+--sync_slave_with_master
+
+--connection master
+--let datadir= `select @@datadir`
+--let filename= query_get_value(SHOW MASTER STATUS, File, 1)
+--let local=$datadir/$filename
+--let primary_outfile=$MYSQLTEST_VARDIR/tmp/primary_binlog.sql
+--echo # MYSQL_BINLOG local > primary_outfile
+--exec $MYSQL_BINLOG $local > $primary_outfile
+
+--let $assert_count= 3
+--let $assert_text= Ensure only $assert_count GTID events exist (Primary)
+--let $assert_select=GTID [0-9]-[0-9]-[0-9]
+--let $assert_file= $primary_outfile
+--source include/assert_grep.inc
+
+--let $assert_text= Ensure each GTID event has the thread id (Primary)
+--let $assert_select=GTID [0-9]-[0-9]-[0-9].*thread_id=$primary_thread_id\$
+--source include/assert_grep.inc
+
+--echo #
+--echo # GTID event's thread_id should not use psuedo_thread_id
+--connection master
+--let $old_pseudo_id= `SELECT @@SESSION.pseudo_thread_id`
+set @@pseudo_thread_id=99999;
+insert into t1 values(2);
+--echo # MYSQL_BINLOG local > primary_outfile
+--exec $MYSQL_BINLOG $local > $primary_outfile
+
+--let $assert_count= 0
+--let $assert_text= GTID event's thread_id does not use pseudo_thread_id
+--let $assert_select=GTID [0-9]-[0-9]-[0-9].*thread_id=99999\$
+--source include/assert_grep.inc
+
+--disable_query_log
+--eval set @@pseudo_thread_id=$old_pseudo_id
+--enable_query_log
+
+
+--echo #
+--echo # Test the serial replica
+--connection slave
+--let $sql_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND LIKE 'Slave_SQL'`
+
+--let replica_thread_id=`select connection_id()`
+--let datadir= `select @@datadir`
+--let filename= query_get_value(SHOW MASTER STATUS, File, 1)
+--let local=$datadir/$filename
+--let replica_outfile=$MYSQLTEST_VARDIR/tmp/serial_replica_binlog.sql
+--echo # MYSQL_BINLOG local > replica_outfile
+--exec $MYSQL_BINLOG $local > $replica_outfile
+
+--let $assert_count= 4
+--let $assert_text= Ensure the same number of GTID events on the replica as the primary
+--let $assert_select=GTID [0-9]-[0-9]-[0-9]
+--let $assert_file= $replica_outfile
+--source include/assert_grep.inc
+
+--let $assert_text= Ensure each GTID event has the thread id of the SQL Thread
+--let $assert_select=GTID [0-9]-[0-9]-[0-9].*thread_id=$sql_thread_id\$
+--source include/assert_grep.inc
+
+
+--echo #
+--echo # Test the parallel replica
+--connection slave
+--source include/stop_slave.inc
+--let $old_parallel_threads= `SELECT @@GLOBAL.slave_parallel_threads`
+SET @@GLOBAL.slave_parallel_threads=1;
+--source include/start_slave.inc
+
+--connection master
+insert into t1 values(3);
+insert into t1 values(4);
+--sync_slave_with_master
+
+--connection slave
+--let $worker_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND LIKE 'Slave_worker'`
+--echo # MYSQL_BINLOG local > replica_outfile
+--exec $MYSQL_BINLOG $local > $replica_outfile
+
+--let $assert_count= 6
+--let $assert_text= Ensure the same number of GTID events on the replica as the primary
+--let $assert_select=GTID [0-9]-[0-9]-[0-9]
+#--let $assert_file= $replica_outfile
+--source include/assert_grep.inc
+
+--let $assert_count= 2
+--let $assert_text= Ensure only the new GTID events have the thread id of the worker thread
+--let $assert_select=GTID [0-9]-[0-9]-[0-9].*thread_id=$worker_thread_id\$
+--source include/assert_grep.inc
+
+--source include/stop_slave.inc
+--eval SET @@GLOBAL.slave_parallel_threads=$old_parallel_threads
+--source include/start_slave.inc
+
+
+
+--echo #
+--echo # Cleanup
+--connection master
+drop table t1;
+remove_file $primary_outfile;
+remove_file $replica_outfile;
+
+--source include/rpl_end.inc

mysql-test/suite/rpl/t/rpl_parallel_optimistic_until.test

@@ -430,7 +430,9 @@ START SLAVE IO_THREAD;
 --let $pos_until= 3130
 --let $file_rl= slave-relay-bin.000018
 
---let $pos_gtid = 2987
+# Todo: change to compute the explicit postion as it may may further change
+#       with events evolution.
+--let $pos_gtid = 2993
 --let $info= query_get_value(SHOW RELAYLOG EVENTS IN '$file_rl' FROM $pos_gtid LIMIT 1, Info, 1)
 
 if (`SELECT "$info" != "BEGIN GTID 0-1-23"`)
@@ -438,7 +440,8 @@ if (`SELECT "$info" != "BEGIN GTID 0-1-23"`)
   --echo *** Unexpected offset. Refine it to point to the correct GTID!
   --die
 }
---let $pos_event = 3120
+# Todo: ditto
+--let $pos_event = 3129
 --let $type= query_get_value(SHOW RELAYLOG EVENTS IN '$file_rl' FROM $pos_event LIMIT 1, Event_type, 1)
 if (`SELECT "$type" != "Delete_rows_v1"`)
 {

sql/log_event.cc

@@ -1584,6 +1584,9 @@ Query_log_event::Query_log_event(const uchar *buf, uint event_len,
         sa_seq_no = uint8korr(pos);
         pos+= 8;
       }
+    }
+    case Q_DUMMY:
+    {
       break;
     }
     default:
@@ -1901,11 +1904,12 @@ Query_log_event::begin_event(String *packet, ulong ev_offset,
   /*
     Currently we only need to replace GTID event.
     The length of GTID differs depending on whether it contains commit id.
+    And/or thread id.
   */
-  DBUG_ASSERT(data_len == LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN ||
-              data_len == LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN + 2);
-  if (data_len != LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN &&
-      data_len != LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN + 2)
+  DBUG_ASSERT(data_len >= LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN &&
+              data_len <= LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN + 2 + 9);
+  if (data_len < LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN ||
+      data_len > LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN + 2 + 9)
     return 1;
 
   flags= uint2korr(p + FLAGS_OFFSET);
@@ -1926,9 +1930,19 @@ Query_log_event::begin_event(String *packet, ulong ev_offset,
   }
   else
   {
-    DBUG_ASSERT(data_len == LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN + 2);
-    /* Put in an empty time_zone_str to take up the extra 2 bytes. */
-    int2store(q + Q_STATUS_VARS_LEN_OFFSET, 2);
+    DBUG_ASSERT(data_len <= LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN + 11);
+    DBUG_ASSERT(data_len >= LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN + 2);
+
+    /* Put in an empty time_zone_str to take up the extra 2 plus the number of
+       dummy_bytes. */
+    size_t dummy_bytes=
+        data_len - (LOG_EVENT_HEADER_LEN + GTID_HEADER_LEN + 2);
+
+    int2store(q + Q_STATUS_VARS_LEN_OFFSET, dummy_bytes + 2);
+    for (size_t i= 0; i < dummy_bytes; i++)
+      q[Q_DATA_OFFSET + i]= Q_DUMMY;
+    q+= dummy_bytes;
+
     q[Q_DATA_OFFSET]= Q_TIME_ZONE_CODE;
     q[Q_DATA_OFFSET+1]= 0;           /* Zero length for empty time_zone_str */
     q[Q_DATA_OFFSET+2]= 0;                  /* Zero terminator for empty db */
@@ -2394,7 +2408,7 @@ Gtid_log_event::Gtid_log_event(const uchar *buf, uint event_len,
                                const Format_description_log_event
                                *description_event)
   : Log_event(buf, description_event), seq_no(0), commit_id(0),
-    flags_extra(0), extra_engines(0)
+    flags_extra(0), extra_engines(0), thread_id(0)
 {
   uint8 header_size= description_event->common_header_len;
   uint8 post_header_len= description_event->post_header_len[GTID_EVENT-1];
@@ -2454,6 +2468,16 @@ Gtid_log_event::Gtid_log_event(const uchar *buf, uint event_len,
       sa_seq_no= uint8korr(buf);
       buf+= 8;
     }
+
+    if (flags_extra & FL_EXTRA_THREAD_ID)
+    {
+      DBUG_ASSERT(static_cast<uint>(buf - buf_0) <= event_len + 8);
+
+      thread_id= uint8korr(buf);
+      buf+= 8;
+
+      DBUG_ASSERT(thread_id > 0);
+    }
   }
   /*
     the strict '<' part of the assert corresponds to extra zero-padded

sql/log_event.h

@@ -324,6 +324,7 @@ class String;
 
 #define Q_HRNOW 128
 #define Q_XID   129
+#define Q_DUMMY 255
 
 #define Q_GTID_FLAGS3 130
 
@@ -3324,6 +3325,7 @@ class Gtid_log_event: public Log_event
     When zero the event does not contain that information.
   */
   uint8 extra_engines;
+  my_thread_id thread_id;
 
   /* Flags2. */
 
@@ -3369,6 +3371,7 @@ class Gtid_log_event: public Log_event
   static const uchar FL_START_ALTER_E1= 2;
   static const uchar FL_COMMIT_ALTER_E1= 4;
   static const uchar FL_ROLLBACK_ALTER_E1= 8;
+  static const uchar FL_EXTRA_THREAD_ID= 16; // thread_id like in BEGIN Query
 
 #ifdef MYSQL_SERVER
   Gtid_log_event(THD *thd_arg, uint64 seq_no, uint32 domain_id, bool standalone,

sql/log_event_client.cc

@@ -3836,6 +3836,12 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info)
     if (flags_extra & FL_ROLLBACK_ALTER_E1)
       if (my_b_printf(&cache, " ROLLBACK ALTER id= %lu", sa_seq_no))
         goto err;
+    if (flags_extra & FL_EXTRA_THREAD_ID)
+    {
+      longlong10_to_str(thread_id, buf2, 10);
+      if (my_b_printf(&cache, " thread_id=%s", buf2))
+        goto err;
+    }
     if (my_b_printf(&cache, "\n"))
       goto err;
 

sql/log_event_server.cc

@@ -2812,7 +2812,7 @@ Gtid_log_event::Gtid_log_event(THD *thd_arg, uint64 seq_no_arg,
     seq_no(seq_no_arg), commit_id(commit_id_arg), domain_id(domain_id_arg),
     flags2((standalone ? FL_STANDALONE : 0) |
            (commit_id_arg ? FL_GROUP_COMMIT_ID : 0)),
-    flags_extra(0), extra_engines(0)
+    flags_extra(0), extra_engines(0), thread_id(thd_arg->thread_id)
 {
   cache_type= Log_event::EVENT_NO_CACHE;
   bool is_tmp_table= thd_arg->lex->stmt_accessed_temp_table();
@@ -2836,6 +2836,8 @@ Gtid_log_event::Gtid_log_event(THD *thd_arg, uint64 seq_no_arg,
   /* Preserve any DDL or WAITED flag in the slave's binlog. */
   if (thd_arg->rgi_slave)
     flags2|= (thd_arg->rgi_slave->gtid_ev_flags2 & (FL_DDL|FL_WAITED));
+  if (thread_id > 0)
+    flags_extra|= FL_EXTRA_THREAD_ID;
 
   XID_STATE &xid_state= thd->transaction->xid_state;
   if (is_transactional)
@@ -2926,7 +2928,10 @@ Gtid_log_event::peek(const uchar *event_start, size_t event_len,
 bool
 Gtid_log_event::write(Log_event_writer *writer)
 {
-  uchar buf[GTID_HEADER_LEN+2+sizeof(XID) + /* flags_extra: */ 1+4];
+  uchar buf[GTID_HEADER_LEN + 2 + sizeof(XID)
+            + 1 /* flags_extra: */
+            + 4 /* Extra Engines */
+            + 8 /* FL_EXTRA_THREAD_ID */];
   size_t write_len= 13;
 
   int8store(buf, seq_no);
@@ -2967,6 +2972,12 @@ Gtid_log_event::write(Log_event_writer *writer)
     write_len+= 8;
   }
 
+  if (flags_extra & FL_EXTRA_THREAD_ID)
+  {
+    int8store(buf + write_len, thread_id);
+    write_len+= 8;
+  }
+
   if (write_len < GTID_HEADER_LEN)
   {
     bzero(buf+write_len, GTID_HEADER_LEN-write_len);