summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorDaniel Black <daniel.black@au.ibm.com>2017-03-03 16:58:03 +1100
committerSergey Vojtovich <svoj@mariadb.org>2017-03-08 11:31:20 +0400
commit8c3b98fe5aa8482ffa67e1e38354f5e98113e3ef (patch)
tree035fac3fc789f24ce36307b5a4d067cd42840788 /sql/item_sum.cc
parent2d948ebd19c5a15728ac1a545bb4082d9d3cb5f2 (diff)
downloadmariadb-git-8c3b98fe5aa8482ffa67e1e38354f5e98113e3ef.tar.gz
Whitespace correction to avoid compile warning
Introduced 2f63e2e2a Compiler error was: sql/log_event.cc: In function ‘size_t log_event_print_value(IO_CACHE*, const uchar*, uint, uint, char*, size_t)’: sql/log_event.cc:2897:7: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation] if (!ptr) ^~ sql/log_event.cc:2900:9: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’ int32 i32= uint2korr(ptr); ^~~~~ Added in 950abd526 Error was: sql/item_sum.cc:3478:5: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation] if ((!args[i]->fixed && ^~ /sql/item_sum.cc:3482:7: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’ with_subselect|= args[i]->with_subselect; ^~~~~~~~~~~~~~ Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 098b1ea8750..d0ffa42ae33 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -3479,7 +3479,7 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref)
args[i]->fix_fields(thd, args + i)) ||
args[i]->check_cols(1))
return TRUE;
- with_subselect|= args[i]->with_subselect;
+ with_subselect|= args[i]->with_subselect;
}
/* skip charset aggregation for order columns */