bk commit into 4.1 tree (bar:1.2394) BUG#12829

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar 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.2394 05/08/30 15:36:47 bar@stripped +3 -0
  Bug #12829
  Cannot convert the charset of a GROUP_CONCAT result:
  
  item_sum.cc:
    "result" character set was not set into proper value.
  
  func_gconcat.result, func_gconcat.test:
    Fixing tests accordingly.

  mysql-test/r/func_gconcat.result
    1.39 05/08/30 15:35:57 bar@stripped +9 -0
    Bug #12829

  mysql-test/t/func_gconcat.test
    1.31 05/08/30 15:35:52 bar@stripped +10 -0
    Bug #12829

  sql/item_sum.cc
    1.143 05/08/30 15:35:05 bar@stripped +1 -0
    Bug #12829
    Cannot convert the charset of a GROUP_CONCAT result:
    "result" character set was not set into proper value.

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.142/sql/item_sum.cc	2005-08-03 01:11:19 +05:00
+++ 1.143/sql/item_sum.cc	2005-08-30 15:35:05 +05:00
@@ -1937,6 +1937,7 @@
                         args, arg_count, MY_COLL_ALLOW_CONV))
     return 1;
 
+  result.set_charset(collation.collation);
   result_field= 0;
   null_value= 1;
   max_length= group_concat_max_len;

--- 1.38/mysql-test/r/func_gconcat.result	2005-07-29 07:10:32 +05:00
+++ 1.39/mysql-test/r/func_gconcat.result	2005-08-30 15:35:57 +05:00
@@ -469,6 +469,15 @@
 ERROR HY000: Illegal mix of collations (cp1250_general_ci,IMPLICIT) and
(koi8r_general_ci,IMPLICIT) for operation 'group_concat'
 drop table t1;
 drop table t2;
+CREATE TABLE t1 (a CHAR(10) CHARACTER SET cp850);
+INSERT INTO t1 VALUES ('À');
+SELECT a FROM t1;
+a
+À
+SELECT GROUP_CONCAT(a) FROM t1;
+GROUP_CONCAT(a)
+À
+DROP TABLE t1;
 CREATE TABLE t1 (id int);
 SELECT GROUP_CONCAT(id) AS gc FROM t1 HAVING gc IS NULL;
 gc

--- 1.30/mysql-test/t/func_gconcat.test	2005-07-29 07:09:59 +05:00
+++ 1.31/mysql-test/t/func_gconcat.test	2005-08-30 15:35:52 +05:00
@@ -282,6 +282,16 @@
 drop table t2;
 
 #
+# Bug #12829
+# Cannot convert the charset of a GROUP_CONCAT result
+#
+CREATE TABLE t1 (a CHAR(10) CHARACTER SET cp850);
+INSERT INTO t1 VALUES ('À');
+SELECT a FROM t1;
+SELECT GROUP_CONCAT(a) FROM t1;
+DROP TABLE t1;
+
+#
 # bug #7769: group_concat returning null is checked in having
 #
 CREATE TABLE t1 (id int);