summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-11 14:27:16 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-11 14:37:35 +0200
commit3ab33c6c929ca615e73465f638a96bdec74adfcf (patch)
treec31dd0b5b444cf319cdf3ee20a2e697859b82443
parentbe77fa914c30e92e33e60feb5a3e098c765798af (diff)
downloadmariadb-git-3ab33c6c929ca615e73465f638a96bdec74adfcf.tar.gz
Cleanup: clang-10 -Wmisleading-indentation
Also, remove some trailing white space and add missing static qualifier to free_annotate_event().
-rw-r--r--client/mysqlbinlog.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 979b82463b0..a88c93516b5 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, 2014, 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
@@ -151,7 +151,7 @@ enum Exit_status {
*/
static Annotate_rows_log_event *annotate_event= NULL;
-void free_annotate_event()
+static void free_annotate_event()
{
if (annotate_event)
{
@@ -854,7 +854,7 @@ static bool print_row_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
print_event_info->m_table_map_ignored.get_table(table_id);
bool skip_event= (ignored_map != NULL);
- /*
+ /*
end of statement check:
i) destroy/free ignored maps
ii) if skip event
@@ -865,21 +865,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