diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-09-21 12:21:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-09-21 12:21:46 +0400 |
| commit | 1956340247eaa14138e2af0b0e2db29cc6bd14e8 (patch) | |
| tree | 3f6ee5c3f69fc343bfcd8412fa7f1c8568429806 /sql/item_sum.cc | |
| parent | f727fb45d4aa6cb3b483366f7b6ab7bbb2a5923c (diff) | |
| download | mariadb-git-1956340247eaa14138e2af0b0e2db29cc6bd14e8.tar.gz | |
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.
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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); |