diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-16 16:24:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-16 16:24:36 +0200 |
| commit | e5e95a287e2e449a63b3b8badfcc54f8fc84a072 (patch) | |
| tree | 143e1d7abcd07c7afd2aaf0615f9a192409825c9 /client/mysqlbinlog.cc | |
| parent | 2b3f6ab417a116d213c24ed506b2ea468f24f413 (diff) | |
| parent | c7daabdb0579531a22c24697f9efbe2ea2759435 (diff) | |
| download | mariadb-git-e5e95a287e2e449a63b3b8badfcc54f8fc84a072.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index cb1b02de81c..c12f51457ea 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2009, 2019, MariaDB + Copyright (c) 2009, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -180,7 +180,7 @@ enum Exit_status { */ static Annotate_rows_log_event *annotate_event= NULL; -void free_annotate_event() +static void free_annotate_event() { if (annotate_event) { @@ -926,7 +926,7 @@ static bool print_row_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, } } - /* + /* end of statement check: i) destroy/free ignored maps ii) if skip event @@ -937,21 +937,21 @@ static bool print_row_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, */ if (is_stmt_end) { - /* + /* Now is safe to clear ignored map (clear_tables will also delete original table map events stored in the map). */ if (print_event_info->m_table_map_ignored.count() > 0) print_event_info->m_table_map_ignored.clear_tables(); - /* + /* If there is a kept Annotate event and all corresponding rbr-events were filtered away, the Annotate event was not freed and it is just the time to do it. */ - free_annotate_event(); + free_annotate_event(); - /* + /* One needs to take into account an event that gets filtered but was last event in the statement. If this is the case, previous rows events that were written into |