diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-13 10:26:01 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-13 10:26:01 +0300 |
commit | 6e6318b29b446f76f01f2ef65d1460870b607d2a (patch) | |
tree | 8c22bb7661b77c91b28532ddd7c150d4bf010146 /sql/item_subselect.h | |
parent | 450c017c2d9e490d92c949d5164b4a99b6b3f5db (diff) | |
parent | e262eb165c197083df9f4986ab54c5b2dcbd6290 (diff) | |
download | mariadb-git-6e6318b29b446f76f01f2ef65d1460870b607d2a.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_subselect.h')
-rw-r--r-- | sql/item_subselect.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index df8250787a5..16c683b27e0 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -285,7 +285,8 @@ public: friend bool Item_ref::fix_fields(THD *, Item **); friend void mark_select_range_as_dependent(THD*, st_select_lex*, st_select_lex*, - Field*, Item*, Item_ident*); + Field*, Item*, Item_ident*, + bool); friend bool convert_join_subqueries_to_semijoins(JOIN *join); }; |