mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Bug#27171 mysqlbinlog produces different output depends from option -R
Server starts any binlog dump from Format_description_log_event, this shifted all offset calculations in mysqlbinlog and made it to stop the dump earlier than --stop-position. Now mysqlbinlog takes Format_description_log_event into account
This commit is contained in:
@ -1040,7 +1040,7 @@ static int dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
|
||||
uint logname_len;
|
||||
NET* net;
|
||||
int error= 0;
|
||||
my_off_t old_off= start_position_mot;
|
||||
my_off_t old_off= min(start_position_mot, BIN_LOG_HEADER_SIZE);
|
||||
char fname[FN_REFLEN+1];
|
||||
DBUG_ENTER("dump_remote_log_entries");
|
||||
|
||||
@ -1192,10 +1192,17 @@ could be out of memory");
|
||||
}
|
||||
}
|
||||
/*
|
||||
Let's adjust offset for remote log as for local log to produce
|
||||
similar text.
|
||||
Let's adjust offset for remote log as for local log to produce
|
||||
similar text and to have --stop-position to work identically.
|
||||
|
||||
Exception - the server sends Format_description_log_event
|
||||
in the beginning of the dump, and only after it the event from
|
||||
start_position. Let the old_off reflect it.
|
||||
*/
|
||||
old_off+= len-1;
|
||||
if (old_off < start_position_mot)
|
||||
old_off= start_position_mot;
|
||||
else
|
||||
old_off+= len-1;
|
||||
}
|
||||
|
||||
err:
|
||||
|
Reference in New Issue
Block a user