From 1956340247eaa14138e2af0b0e2db29cc6bd14e8 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 21 Sep 2015 12:21:46 +0400 Subject: Removing global function agg_item_charsets_for_string_result(). Moving agg_arg_charsets_for_string_result() and agg_arg_charsets_for_string_result_with_comparison() inside "protected" section in Item_func_or_sum. --- sql/item_sum.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/item_sum.cc') diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 79471bb6d50..1a97a086a16 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3448,8 +3448,8 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) } /* skip charset aggregation for order columns */ - if (agg_item_charsets_for_string_result(collation, func_name(), - args, arg_count - arg_count_order)) + if (agg_arg_charsets_for_string_result(collation, + args, arg_count - arg_count_order)) return 1; result.set_charset(collation.collation); -- cgit v1.2.1