diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-05 14:01:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-05 14:01:59 +0200 |
| commit | 9989c26bc99c90d3047a7b3e20e0800b62f62300 (patch) | |
| tree | 0a2b04288168bf08530568c94c326f2e9a98a397 /sql/item_sum.cc | |
| parent | 39d248fa555350756a569d766f11eec4c65c5b16 (diff) | |
| parent | 3c07ed141c2ed885dea13fbce8603afce6250590 (diff) | |
| download | mariadb-git-9989c26bc99c90d3047a7b3e20e0800b62f62300.tar.gz | |
Merge branch '10.0' into 10.1
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 0e2e9f0795d..b4e31ba012f 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1159,6 +1159,7 @@ Item_sum_num::fix_fields(THD *thd, Item **ref) return TRUE; set_if_bigger(decimals, args[i]->decimals); with_subselect|= args[i]->with_subselect; + with_param|= args[i]->with_param; } result_field=0; max_length=float_length(decimals); @@ -1190,6 +1191,7 @@ Item_sum_hybrid::fix_fields(THD *thd, Item **ref) return TRUE; Type_std_attributes::set(args[0]); with_subselect= args[0]->with_subselect; + with_param= args[0]->with_param; Item *item2= item->real_item(); if (item2->type() == Item::FIELD_ITEM) @@ -3361,6 +3363,7 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) args[i]->check_cols(1)) return TRUE; with_subselect|= args[i]->with_subselect; + with_param|= args[i]->with_param; } /* skip charset aggregation for order columns */ |