database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Revert "MDEV-7850: Extend GTID Binlog Events with Thread Id"

Browse Source 
This reverts commit c37b2087b4.

In c37b20887, when re-binlogging a GTID event on a replica,
it will overwrite the thread_id from the primary to be the
value of the slave applier (SQL thread or parallel worker).

This should be the value of the original thread_id on the
master connection though, to both help track temporary
tables, and be consistent with Query_log_event.

Reverting the commit to re-target 11.5, so we can re-test
with the corrected thread_id.
This commit is contained in:
Brandon Nesterenko
2024-02-05 05:56:53 -07:00
parent e30e9fc628
commit 9b1ea69049
34 changed files with 785 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/multi_source/multisource_for_channel.result
View File

@ -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 1373 master-bin.000002;pos=4
mysqld-relay-bin-master1.000003 256 Rotate 1 1358 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'

6
mysql-test/suite/multi_source/reset_slave.test
View File

@ -39,9 +39,9 @@ stop slave 'master1';
--let $datadir = `SELECT @@datadir`
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`;
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`;
--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;