1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Cleanup: clang-10 -Wmisleading-indentation

Also, remove some trailing white space and add missing static
qualifier to free_annotate_event().
This commit is contained in:
Marko Mäkelä
2020-03-11 14:27:16 +02:00
parent be77fa914c
commit 3ab33c6c92

View File

@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2000, 2014, Oracle and/or its affiliates. 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 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 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; static Annotate_rows_log_event *annotate_event= NULL;
void free_annotate_event() static void free_annotate_event()
{ {
if (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); print_event_info->m_table_map_ignored.get_table(table_id);
bool skip_event= (ignored_map != NULL); bool skip_event= (ignored_map != NULL);
/* /*
end of statement check: end of statement check:
i) destroy/free ignored maps i) destroy/free ignored maps
ii) if skip event 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) if (is_stmt_end)
{ {
/* /*
Now is safe to clear ignored map (clear_tables will also Now is safe to clear ignored map (clear_tables will also
delete original table map events stored in the map). delete original table map events stored in the map).
*/ */
if (print_event_info->m_table_map_ignored.count() > 0) if (print_event_info->m_table_map_ignored.count() > 0)
print_event_info->m_table_map_ignored.clear_tables(); print_event_info->m_table_map_ignored.clear_tables();
/* /*
If there is a kept Annotate event and all corresponding If there is a kept Annotate event and all corresponding
rbr-events were filtered away, the Annotate event was not rbr-events were filtered away, the Annotate event was not
freed and it is just the time to do it. 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 One needs to take into account an event that gets
filtered but was last event in the statement. If this is filtered but was last event in the statement. If this is
the case, previous rows events that were written into the case, previous rows events that were written into