1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

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

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

View File

@@ -430,9 +430,7 @@ START SLAVE IO_THREAD;
--let $pos_until= 3130
--let $file_rl= slave-relay-bin.000018
# Todo: change to compute the explicit postion as it may may further change
# with events evolution.
--let $pos_gtid = 2993
--let $pos_gtid = 2987
--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"`)
@@ -440,8 +438,7 @@ if (`SELECT "$info" != "BEGIN GTID 0-1-23"`)
--echo *** Unexpected offset. Refine it to point to the correct GTID!
--die
}
# Todo: ditto
--let $pos_event = 3129
--let $pos_event = 3120
--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"`)
{