mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-28 19:25:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Removing global function agg_item_charsets_for_string_result().

Browse source 
Moving agg_arg_charsets_for_string_result() and
agg_arg_charsets_for_string_result_with_comparison() inside
"protected" section in Item_func_or_sum.
This commit is contained in:
Alexander Barkov 2015-09-21 12:21:46 +04:00
commit 1956340247
3 changed files with 35 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/item_sum.cc
View file

@ -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);