summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2007-07-19 21:40:12 +0400
committerunknown <evgen@moonbone.local>2007-07-19 21:40:12 +0400
commitd0020607b324cb9e5c3f930315a4fb0c4a65239b (patch)
tree6a01a32afcc9fdfb0498221cafeed64993631fa7 /sql
parent248c5e24e91f1d5916fd05cda4339fbfc8600ffe (diff)
parent7f6a8164846da34a822e8f844d6ec9e1da3af412 (diff)
downloadmariadb-git-d0020607b324cb9e5c3f930315a4fb0c4a65239b.tar.gz
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/29850-bug-5.0-opt-mysql
Diffstat (limited to 'sql')
-rw-r--r--sql/item_sum.cc1
1 files changed, 1 insertions, 0 deletions
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);
}