summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-03-01 13:06:11 +0300
committerAlexander Nozdrin <alik@sun.com>2010-03-01 13:06:11 +0300
commite0d1373a3baec3a42dfa88544ba4d760868df049 (patch)
tree081912c9d4ed65399258f0edf6887fe9b563e083 /sql/item_sum.cc
parent1bba800acea916d3e4d9e3e314f6f0fe03cc742d (diff)
parent7a83782f1caa102ebc552b017885f18f005425f0 (diff)
downloadmariadb-git-e0d1373a3baec3a42dfa88544ba4d760868df049.tar.gz
Manual merge from mysql-next-mr.
Conflicts: - sql/item.cc
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index d09a9247ffa..cb0fd82bd54 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -3202,11 +3202,9 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref)
return TRUE;
}
- if (agg_item_charsets(collation, func_name(),
- args,
- /* skip charset aggregation for order columns */
- arg_count - arg_count_order,
- MY_COLL_ALLOW_CONV, 1))
+ /* skip charset aggregation for order columns */
+ if (agg_item_charsets_for_string_result(collation, func_name(),
+ args, arg_count - arg_count_order))
return 1;
result.set_charset(collation.collation);