diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-06-18 22:38:11 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-06-18 22:38:11 +0400 |
| commit | 90fbd8b22b4b84cdc027fed26012efd87c2b6737 (patch) | |
| tree | 48eff1dbe5fd3468e7583d1748de6b5cc8b16c92 /sql/item_sum.cc | |
| parent | db6dbadb5a9edd9e93398b6afe8e3196eb768e0a (diff) | |
| parent | 64aa1fcb1354ffa24999a1512258c897116b0928 (diff) | |
| download | mariadb-git-90fbd8b22b4b84cdc027fed26012efd87c2b6737.tar.gz | |
Merge 5.2->5.3
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 60ec27863bd..86aef19efc0 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -588,6 +588,7 @@ Item_sum_num::fix_fields(THD *thd, Item **ref) if (args[i]->fix_fields(thd, args + i) || args[i]->check_cols(1)) return TRUE; set_if_bigger(decimals, args[i]->decimals); + with_subselect|= args[i]->with_subselect; } result_field=0; max_length=float_length(decimals); @@ -618,6 +619,7 @@ Item_sum_hybrid::fix_fields(THD *thd, Item **ref) (item= args[0])->check_cols(1)) return TRUE; decimals=item->decimals; + with_subselect= args[0]->with_subselect; switch (hybrid_type= item->result_type()) { case INT_RESULT: @@ -3253,6 +3255,7 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) args[i]->fix_fields(thd, args + i)) || args[i]->check_cols(1)) return TRUE; + with_subselect|= args[i]->with_subselect; } if (agg_item_charsets(collation, func_name(), |