diff options
| author | jimw@mysql.com <> | 2005-08-31 15:24:06 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-08-31 15:24:06 -0700 |
| commit | 1d997477aa848779ea38526e18aaf824fd0ac3de (patch) | |
| tree | 63161ccb51465f90409872099f902b79a9d23837 /sql/item_sum.cc | |
| parent | 41fc00641cf0bcab8bf52059c4e482c964f261fc (diff) | |
| parent | e0f3c5c0fb936fd0ebeee54c07ae16265e9537b9 (diff) | |
| download | mariadb-git-1d997477aa848779ea38526e18aaf824fd0ac3de.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index e86d4f0d8ba..f6544d76504 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2983,7 +2983,7 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) } thd->allow_sum_func= 0; - maybe_null= 0; + maybe_null= 1; /* Fix fields for select list and ORDER clause @@ -2995,8 +2995,6 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) args[i]->fix_fields(thd, args + i)) || args[i]->check_cols(1)) return TRUE; - if (i < arg_count_field) - maybe_null|= args[i]->maybe_null; } if (agg_item_charsets(collation, func_name(), |