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 gleb.loc:/home/uchum/work/bk/5.0-opt

Browse Source 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
This commit is contained in:
gshchepa/uchum@gleb.loc
2007-07-20 04:04:57 +05:00
parent c4b12955b3 7a2491871d
commit c404cd7c9c
3 changed files with 21 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

@ -816,4 +816,13 @@ LENGTH( GROUP_CONCAT( a ) )
65535 65535
SET group_concat_max_len= DEFAULT; SET group_concat_max_len= DEFAULT;
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
set names latin1;
create table t1 (id int, name varchar(20)) DEFAULT CHARSET=utf8;
insert into t1 (id, name) values (1, "<22>ra");
insert into t1 (id, name) values (2, "<22>ra");
select b.id, group_concat(b.name) from t1 a, t1 b group by b.id;
id group_concat(b.name)
1 <09>ra,<2C>ra
2 <09>ra,<2C>ra
drop table t1;
End of 5.0 tests End of 5.0 tests

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

@ -551,4 +551,15 @@ SELECT LENGTH( GROUP_CONCAT( a ) ) FROM t3 WHERE b = 3;
SET group_concat_max_len= DEFAULT; SET group_concat_max_len= DEFAULT;
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
#
# Bug#29850: Wrong charset of the GROUP_CONCAT result when the select employs
# a temporary table.
#
set names latin1;
create table t1 (id int, name varchar(20)) DEFAULT CHARSET=utf8;
insert into t1 (id, name) values (1, "<22>ra");
insert into t1 (id, name) values (2, "<22>ra");
select b.id, group_concat(b.name) from t1 a, t1 b group by b.id;
drop table t1;
--echo End of 5.0 tests --echo End of 5.0 tests

1
sql/item_sum.cc
View File

@ -3089,6 +3089,7 @@ Item_func_group_concat::Item_func_group_concat(THD *thd,
original(item) original(item)
{ {
quick_group= item->quick_group; quick_group= item->quick_group;
result.set_charset(collation.collation);
} }