Fix for bug#18281 group_concat changes charset to binary

 skip charset aggregation for order columns

1 files changed, 4 insertions, 1 deletions

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 1cd1741cea6..8826144266e 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -3226,7 +3226,10 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref)
   }
 
   if (agg_item_charsets(collation, func_name(),
-                        args, arg_count, MY_COLL_ALLOW_CONV))
+                        args,
+			/* skip charset aggregation for order columns */
+			arg_count - arg_count_order,
+			MY_COLL_ALLOW_CONV))
     return 1;
 
   result.set_charset(collation.collation);