diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-17 07:58:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-17 07:58:41 +0200 |
| commit | c7ba92372b8e21c42eb5df20f080c941fc84a144 (patch) | |
| tree | 7e74d58b0a47b556a1b411ed0ad14e38384d6991 /client/mysqlbinlog.cc | |
| parent | 023d9867327c0c5dfe95173c0731940fe6df74ab (diff) | |
| parent | 097e2f9d0aa0dc7f1c4a7cff52260944db28e3c8 (diff) | |
| download | mariadb-git-c7ba92372b8e21c42eb5df20f080c941fc84a144.tar.gz | |
Merge 10.4 into 10.5
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 eb50eff5a1d..05983b57f4e 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 @@ -184,7 +184,7 @@ enum Exit_status { */ static Annotate_rows_log_event *annotate_event= NULL; -void free_annotate_event() +static void free_annotate_event() { if (annotate_event) { @@ -930,7 +930,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 @@ -941,21 +941,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 |