Commit 7a249187 authored by evgen@moonbone.local's avatar evgen@moonbone.local
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  moonbone.local:/mnt/gentoo64/work/29850-bug-5.0-opt-mysql
parents cd70db66 934089a8

mysql-test/r/func_gconcat.result

+9 −0
Original line number Diff line number Diff line
@@ -810,4 +810,13 @@ LENGTH( GROUP_CONCAT( a ) ) 
65535

SET group_concat_max_len= DEFAULT;

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

mysql-test/t/func_gconcat.test

+11 −0
Original line number Diff line number Diff line
@@ -551,4 +551,15 @@ SELECT LENGTH( GROUP_CONCAT( a ) ) FROM t3 WHERE b = 3; 
SET group_concat_max_len= DEFAULT;

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

sql/item_sum.cc

+1 −0
Original line number Diff line number Diff line
@@ -3068,6 +3068,7 @@ Item_func_group_concat::Item_func_group_concat(THD *thd, 
  original(item)

{

  quick_group= item->quick_group;

  result.set_charset(collation.collation);

}