diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-20 04:04:57 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-20 04:04:57 +0500 |
| commit | a71eda722a5755c2d4a9cca7b1ad380a5d0d835a (patch) | |
| tree | f65271a017c12188266a2bbcacba38d65cc23c43 /sql | |
| parent | 39433686e690866bcbf985839b587165ecc91506 (diff) | |
| parent | d0020607b324cb9e5c3f930315a4fb0c4a65239b (diff) | |
| download | mariadb-git-a71eda722a5755c2d4a9cca7b1ad380a5d0d835a.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_sum.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 0fa46d231a9..8fe843a2a2d 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3089,6 +3089,7 @@ Item_func_group_concat::Item_func_group_concat(THD *thd, original(item) { quick_group= item->quick_group; + result.set_charset(collation.collation); } |