diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-06-20 15:01:28 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-06-20 15:01:28 +0400 |
| commit | 8c762965d389dcd9e74c743aaf2a89bd8c18545f (patch) | |
| tree | a266816b7b2a7e5f2266fa46b7b8627aa5543773 /sql/item_sum.cc | |
| parent | 0b93b444b6c4de6b219fd3a4b3d5fa2e388dc211 (diff) | |
| parent | 584d923c3292395a2e8288adcf4795992789f27c (diff) | |
| download | mariadb-git-8c762965d389dcd9e74c743aaf2a89bd8c18545f.tar.gz | |
Merge 5.3 -> 5.5
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 afe4f34bd05..0b21ba92558 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1135,6 +1135,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); @@ -1165,6 +1166,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: @@ -3319,6 +3321,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 */ |