diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
| commit | e415ba0fb2c57eaf370e84a3a9c8d831f820a560 (patch) | |
| tree | f113a8024de4ee4f1bc19aae98c19a2835f5b4e7 /client/mysqlbinlog.cc | |
| parent | 046418ad956c98c3788d79650fcb50479844df3b (diff) | |
| parent | a1f7ceb281f9d87c9baea125ebab26f99a0370f8 (diff) | |
| download | mariadb-git-e415ba0fb2c57eaf370e84a3a9c8d831f820a560.tar.gz | |
Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index b931bd125d6..b3a9291dcef 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -705,10 +705,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)) { |