diff options
| author | bar@mysql.com <> | 2005-07-26 13:25:18 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2005-07-26 13:25:18 +0500 |
| commit | 0255803b4e6373cc0fdb7640c23256c0ce40ae8a (patch) | |
| tree | c659c5adcd34cb4e261a4f8d43d58c826560da26 /sql/item_sum.cc | |
| parent | 9f2624ee510dd546aa48cb4fb08f0e7896d16b56 (diff) | |
| parent | 31b1bdc52a7a17960a10ebae07f73cf158733033 (diff) | |
| download | mariadb-git-0255803b4e6373cc0fdb7640c23256c0ce40ae8a.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b10201
into mysql.com:/usr/home/bar/mysql-5.0
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index d2f1016891b..7bd04626bbd 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2976,6 +2976,10 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) maybe_null|= args[i]->maybe_null; } + if (agg_item_charsets(collation, func_name(), + args, arg_count, MY_COLL_ALLOW_CONV)) + return 1; + result_field= 0; null_value= 1; thd->allow_sum_func= 1; |