Commit c404cd7c authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc

Merge gleb.loc:/home/uchum/work/bk/5.0-opt

into  gleb.loc:/home/uchum/work/bk/5.1-opt
parents c4b12955 7a249187
...@@ -816,4 +816,13 @@ LENGTH( GROUP_CONCAT( a ) ) ...@@ -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, "ra");
insert into t1 (id, name) values (2, "ra");
select b.id, group_concat(b.name) from t1 a, t1 b group by b.id;
id group_concat(b.name)
1 ra,ra
2 ra,ra
drop table t1;
End of 5.0 tests End of 5.0 tests
...@@ -551,4 +551,15 @@ SELECT LENGTH( GROUP_CONCAT( a ) ) FROM t3 WHERE b = 3; ...@@ -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, "ra");
insert into t1 (id, name) values (2, "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
...@@ -3089,6 +3089,7 @@ Item_func_group_concat::Item_func_group_concat(THD *thd, ...@@ -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);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment