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_func.h | |
| parent | 39d248fa555350756a569d766f11eec4c65c5b16 (diff) | |
| parent | 3c07ed141c2ed885dea13fbce8603afce6250590 (diff) | |
| download | mariadb-git-9989c26bc99c90d3047a7b3e20e0800b62f62300.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 25f96be7962..3219c813821 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -74,16 +74,19 @@ public: { with_sum_func= 0; with_field= 0; + with_param= 0; } Item_func(THD *thd, Item *a): Item_func_or_sum(thd, a), allowed_arg_cols(1) { with_sum_func= a->with_sum_func; + with_param= a->with_param; with_field= a->with_field; } Item_func(THD *thd, Item *a, Item *b): Item_func_or_sum(thd, a, b), allowed_arg_cols(1) { with_sum_func= a->with_sum_func || b->with_sum_func; + with_param= a->with_param || b->with_param; with_field= a->with_field || b->with_field; } Item_func(THD *thd, Item *a, Item *b, Item *c): @@ -91,6 +94,7 @@ public: { with_sum_func= a->with_sum_func || b->with_sum_func || c->with_sum_func; with_field= a->with_field || b->with_field || c->with_field; + with_param= a->with_param || b->with_param || c->with_param; } Item_func(THD *thd, Item *a, Item *b, Item *c, Item *d): Item_func_or_sum(thd, a, b, c, d), allowed_arg_cols(1) @@ -99,6 +103,8 @@ public: c->with_sum_func || d->with_sum_func; with_field= a->with_field || b->with_field || c->with_field || d->with_field; + with_param= a->with_param || b->with_param || + c->with_param || d->with_param; } Item_func(THD *thd, Item *a, Item *b, Item *c, Item *d, Item* e): Item_func_or_sum(thd, a, b, c, d, e), allowed_arg_cols(1) @@ -107,6 +113,8 @@ public: c->with_sum_func || d->with_sum_func || e->with_sum_func; with_field= a->with_field || b->with_field || c->with_field || d->with_field || e->with_field; + with_param= a->with_param || b->with_param || + c->with_param || d->with_param || e->with_param; } Item_func(THD *thd, List<Item> &list): Item_func_or_sum(thd, list), allowed_arg_cols(1) |