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

Merged BUG#11766427, BUG#59539 from 5.1 to 5.5.

Browse Source 
No conflicts.
This commit is contained in:
Sven Sandberg
2011-03-25 15:35:45 +01:00
parent 52a01765bd 257e39aa44
commit 732992c693
3 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/mysqlbinlog.cc
View File

@ -714,10 +714,18 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
*/
start_datetime= 0;
offset= 0; // print everything and protect against cycling rec_count
/*
Skip events according to the --server-id flag. However, don't
skip format_description or rotate events, because they they
are really "global" events that are relevant for the entire
binlog, even if they have a server_id. Also, we have to read
the format_description event so that we can parse subsequent
events.
*/
if (ev_type != ROTATE_EVENT &&
server_id && (server_id != ev->server_id))
goto end;
}
if (server_id && (server_id != ev->server_id))
/* skip just this event, continue processing the log. */
goto end;
if (((my_time_t)(ev->when) >= stop_datetime)
|| (pos >= stop_position_mot))
{