diff options
| author | unknown <bar@mysql.com> | 2005-09-07 13:12:29 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-09-07 13:12:29 +0500 |
| commit | 44e289b45144ffd0afbe50b6ac36b5fb23d68d32 (patch) | |
| tree | 87fbc6b6f381db47d48499d00b562a4879a949ab /sql | |
| parent | 745181ce2023908df3657e7514e0681b7c0857b5 (diff) | |
| parent | 52758f7cd8b6d6ba9e4a652d87f142af5bda6697 (diff) | |
| download | mariadb-git-44e289b45144ffd0afbe50b6ac36b5fb23d68d32.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b12829
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 000dcdb4997..6996924caa0 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1935,6 +1935,7 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) args, arg_count, MY_COLL_ALLOW_CONV)) return 1; + result.set_charset(collation.collation); result_field= 0; null_value= 1; max_length= group_concat_max_len; |