bk commit into 5.0 tree (bar:1.2498)

[bar]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2007-06-22 17:28:26+05:00, bar@stripped +3 -0
  Merge abarkov@stripped:/home/bk/mysql-5.0-rpl
  into  mysql.com:/home/bar/mysql-work/mysql-5.0.b28925
  MERGE: 1.2475.82.1

  mysql-test/r/ctype_ucs2_def.result@stripped, 2007-06-22 17:28:24+05:00, bar@stripped +0 -1
    After merge fix
    MERGE: 1.3.1.1

  mysql-test/t/ctype_ucs2_def.test@stripped, 2007-06-22 17:28:24+05:00, bar@stripped +0 -3
    After merge fix
    MERGE: 1.4.1.1

  sql/sql_yacc.yy@stripped, 2007-06-22 17:26:23+05:00, bar@stripped +0 -0
    Auto merged
    MERGE: 1.521.2.1

# 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.myoffice.izhnet.ru
# Root:	/home/bar/mysql-work/mysql-5.0.b28925/RESYNC

--- 1.523/sql/sql_yacc.yy	2007-06-14 16:37:36 +05:00
+++ 1.524/sql/sql_yacc.yy	2007-06-22 17:26:23 +05:00
@@ -5420,8 +5420,11 @@ opt_distinct:
     |DISTINCT   { $$ = 1; };
 
 opt_gconcat_separator:
-    /* empty */        { $$ = new (YYTHD->mem_root) String(",",1,default_charset_info); }
-    |SEPARATOR_SYM text_string  { $$ = $2; };
+    /* empty */
+      {
+        $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1);
+      }
+    | SEPARATOR_SYM text_string { $$ = $2; };
 
 
 opt_gorder_clause:

--- 1.4/mysql-test/r/ctype_ucs2_def.result	2007-05-31 15:54:37 +05:00
+++ 1.5/mysql-test/r/ctype_ucs2_def.result	2007-06-22 17:28:24 +05:00
@@ -7,6 +7,13 @@ character_set_server	ucs2
 DROP TABLE IF EXISTS t1;
 create table t1 (a int);
 drop table t1;
+End of 4.1 tests
+create table t1 (a char(1) character set latin1);
+insert into t1 values ('a'),('b'),('c');
+select hex(group_concat(a)) from t1;
+hex(group_concat(a))
+612C622C63
+drop table t1;
 CREATE TABLE t1(col1 VARCHAR(32) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL, 
 col2 VARCHAR(32) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL, 
 UNIQUE KEY key1 USING HASH (col1, col2)) ENGINE=MEMORY;

--- 1.5/mysql-test/t/ctype_ucs2_def.test	2007-05-31 15:54:37 +05:00
+++ 1.6/mysql-test/t/ctype_ucs2_def.test	2007-06-22 17:28:24 +05:00
@@ -15,6 +15,16 @@ DROP TABLE IF EXISTS t1;
 create table t1 (a int);
 drop table t1;
 
+--echo End of 4.1 tests
+
+#
+# Bug #28925 GROUP_CONCAT inserts wrong separators for a ucs2 column
+# Check that GROUP_CONCAT works fine with --default-character-set=ucs2
+#
+create table t1 (a char(1) character set latin1);
+insert into t1 values ('a'),('b'),('c');
+select hex(group_concat(a)) from t1;
+drop table t1;
 #
 # Bug #27643: query failed : 1114 (The table '' is full)
 #