From 934089a82b065d42e7d1a9f089d526749f150aad Mon Sep 17 00:00:00 2001
From: "evgen@moonbone.local" <>
Date: Thu, 19 Jul 2007 20:21:23 +0400
Subject: [PATCH] Bug#29850: Wrong charset of GROUP_CONCAT result when the
 select employs a temporary table.

The result string of the Item_func_group_concat wasn't initialized in the
copying constructor of the Item_func_group_concat class. This led to a
wrong charset of GROUP_CONCAT result when the select employs a temporary
table.

The copying constructor of the Item_func_group_concat class now correctly
initializes the charset of the result string.
---
 mysql-test/r/func_gconcat.result |  9 +++++++++
 mysql-test/t/func_gconcat.test   | 11 +++++++++++
 sql/item_sum.cc                  |  1 +
 3 files changed, 21 insertions(+)

diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result
index 8b71ad1940e..35487c25ae3 100644
--- a/mysql-test/r/func_gconcat.result
+++ b/mysql-test/r/func_gconcat.result
@@ -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
diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test
index 767df5ae233..ff3ba951870 100644
--- a/mysql-test/t/func_gconcat.test
+++ b/mysql-test/t/func_gconcat.test
@@ -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
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 133f00039b0..fe9f58d84e1 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -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);
 }