bk commit into 5.0 tree (gluh:1.2143) BUG#18281

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2143 06/04/07 13:19:31 gluh@stripped +3 -0
  Fix for bug#18281 group_concat changes charset to binary
   skip charset aggregation for order columns

  sql/item_sum.cc
    1.174 06/04/07 13:19:26 gluh@stripped +4 -1
    Fix for bug#18281 group_concat changes charset to binary
     skip charset aggregation for order columns

  mysql-test/t/func_gconcat.test
    1.41 06/04/07 13:19:26 gluh@stripped +8 -0
    Fix for bug#18281 group_concat changes charset to binary
     skip charset aggregation for order columns

  mysql-test/r/func_gconcat.result
    1.54 06/04/07 13:19:26 gluh@stripped +5 -0
    Fix for bug#18281 group_concat changes charset to binary
     skip charset aggregation for order columns

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.0

--- 1.173/sql/item_sum.cc	Thu Mar 30 20:03:39 2006
+++ 1.174/sql/item_sum.cc	Fri Apr  7 13:19:26 2006
@@ -3226,7 +3226,10 @@ Item_func_group_concat::fix_fields(THD *
   }
 
   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);

--- 1.53/mysql-test/r/func_gconcat.result	Thu Mar 30 18:14:51 2006
+++ 1.54/mysql-test/r/func_gconcat.result	Fri Apr  7 13:19:26 2006
@@ -626,3 +626,8 @@ latin1
 latin1
 drop table t1, t2, t3;
 set names default;
+create table t1 (c1 varchar(10), c2 int);
+select charset(group_concat(c1 order by c2)) from t1;
+charset(group_concat(c1 order by c2))
+latin1
+drop table t1;

--- 1.40/mysql-test/t/func_gconcat.test	Thu Mar 30 18:14:51 2006
+++ 1.41/mysql-test/t/func_gconcat.test	Fri Apr  7 13:19:26 2006
@@ -414,3 +414,11 @@ select charset(a) from t2;
 select charset(a) from t3;
 drop table t1, t2, t3;
 set names default;
+
+#
+# Bug#18281 group_concat changes charset to binary
+#
+create table t1 (c1 varchar(10), c2 int);
+select charset(group_concat(c1 order by c2)) from t1;
+drop table t1;
+