diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-10 16:12:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-10 16:12:45 +0200 |
| commit | a48aa0cd569eda88bef98ed4abe41b0b570fcd51 (patch) | |
| tree | 6008b19aabfe0554432c87614d1022594f08fc5f /sql/item_subselect.h | |
| parent | 8409f721ffe2d91b11d3fc03c6872ff57051bbf8 (diff) | |
| parent | 386e5d476e9bf8f216c760c9076ae0ecdc99054d (diff) | |
| download | mariadb-git-a48aa0cd569eda88bef98ed4abe41b0b570fcd51.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 14394bf6342..9e548e94ac1 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -183,7 +183,7 @@ public: } bool fix_fields(THD *thd, Item **ref); bool mark_as_dependent(THD *thd, st_select_lex *select, Item *item); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); void recalc_used_tables(st_select_lex *new_parent, bool after_pullout); virtual bool exec(); /* @@ -625,7 +625,7 @@ public: enum precedence precedence() const { return CMP_PRECEDENCE; } bool fix_fields(THD *thd, Item **ref); void fix_length_and_dec(); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); bool const_item() const { return Item_subselect::const_item() && left_expr->const_item(); |