diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-06-26 11:37:48 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-06-26 11:37:48 -0700 |
| commit | 4a6a08309cd78091246a7fd598bc43cd25deba45 (patch) | |
| tree | 67d596918a2c844d7d873342caa754c39e526041 /sql/item_sum.cc | |
| parent | 4ff6fd34dae6315384d8c38ea69092cde09b78ba (diff) | |
| parent | 072097174c8b91299fe74a3cd7c5248e6e3cfc57 (diff) | |
| download | mariadb-git-4a6a08309cd78091246a7fd598bc43cd25deba45.tar.gz | |
Merge 5.5 -> 5.5-mwl248.
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 014d7535c1c..59cb97f5983 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1146,6 +1146,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); @@ -1176,6 +1177,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: @@ -3330,6 +3332,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; } /* skip charset aggregation for order columns */ |