diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-29 00:38:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-29 00:38:10 +0200 |
| commit | c4499a03917aecfc2d86142c469d02618cbec54b (patch) | |
| tree | 9cd51b7c8d2274300165840204ae3eb19401942f /sql/item_sum.cc | |
| parent | d6dbe8e2071bf9fdc21b5530abce88ff01b40e25 (diff) | |
| parent | 5cfe52314e29386e1867fad1b44eace2b9d0be7e (diff) | |
| download | mariadb-git-c4499a03917aecfc2d86142c469d02618cbec54b.tar.gz | |
Merge branch '5.5' into 10.0
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 7b017cd810a..fae3f2344df 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1181,6 +1181,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); @@ -1212,6 +1213,7 @@ Item_sum_hybrid::fix_fields(THD *thd, Item **ref) return TRUE; decimals=item->decimals; with_subselect= args[0]->with_subselect; + with_param= args[0]->with_param; switch (hybrid_type= item->result_type()) { case INT_RESULT: @@ -3443,6 +3445,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 */ |