diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-01 13:06:11 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-01 13:06:11 +0300 |
| commit | b73cba223bb6cbf98d55fbe85c75163122e678e1 (patch) | |
| tree | 081912c9d4ed65399258f0edf6887fe9b563e083 /sql/item_sum.cc | |
| parent | 41110ca1bfd706192949d76dbaf947bf83d0c571 (diff) | |
| parent | 06ca4ae33d514f3bfa3eaa8b943876110384a8a3 (diff) | |
| download | mariadb-git-b73cba223bb6cbf98d55fbe85c75163122e678e1.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.cc | 8 |
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); |