database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into  mysql.com:/usr/home/bar/mysql-4.1.b12829


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
This commit is contained in:
unknown
2005-09-07 13:12:29 +05:00
parent 745181ce20 52758f7cd8
commit 44e289b451
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/func_gconcat.result
View File

@ -469,6 +469,15 @@ select collation(group_concat(a,b)) from t1;
ERROR HY000: Illegal mix of collations (cp1250_general_ci,IMPLICIT) and (koi8r_general_ci,IMPLICIT) for operation 'group_concat' ERROR HY000: Illegal mix of collations (cp1250_general_ci,IMPLICIT) and (koi8r_general_ci,IMPLICIT) for operation 'group_concat'
drop table t1; drop table t1;
drop table t2; drop table t2;
CREATE TABLE t1 (a CHAR(10) CHARACTER SET cp850);
INSERT INTO t1 VALUES ('<27>');
SELECT a FROM t1;
a
<EFBFBD>
SELECT GROUP_CONCAT(a) FROM t1;
GROUP_CONCAT(a)
<EFBFBD>
DROP TABLE t1;
CREATE TABLE t1 (id int); CREATE TABLE t1 (id int);
SELECT GROUP_CONCAT(id) AS gc FROM t1 HAVING gc IS NULL; SELECT GROUP_CONCAT(id) AS gc FROM t1 HAVING gc IS NULL;
gc gc

10
mysql-test/t/func_gconcat.test
View File

@ -281,6 +281,16 @@ select collation(group_concat(a,b)) from t1;
drop table t1; drop table t1;
drop table t2; 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 ('<27>');
SELECT a FROM t1;
SELECT GROUP_CONCAT(a) FROM t1;
DROP TABLE t1;
# #
# bug #7769: group_concat returning null is checked in having # bug #7769: group_concat returning null is checked in having
# #

1
sql/item_sum.cc
View File

@ -1935,6 +1935,7 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
args, arg_count, MY_COLL_ALLOW_CONV)) args, arg_count, MY_COLL_ALLOW_CONV))
return 1; return 1;
result.set_charset(collation.collation);
result_field= 0; result_field= 0;
null_value= 1; null_value= 1;
max_length= group_concat_max_len; max_length= group_concat_max_len;