diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 11:35:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 11:35:39 +0300 |
| commit | 6c3e860cbf36831c118f6ea183acbbeb3c889bed (patch) | |
| tree | 8585545cc8a95e790c01eb164f74685674f9f23b /sql/sql_lex.h | |
| parent | 9ff737b25edbcb0c74d9d312f6da702e7d993e88 (diff) | |
| parent | 5008171b05e0d3b8b5f4af312b94a312281e77c7 (diff) | |
| download | mariadb-git-6c3e860cbf36831c118f6ea183acbbeb3c889bed.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index c475c6d3385..846d6b9a822 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1378,7 +1378,8 @@ public: } inline bool is_subquery_function() { return master_unit()->item != 0; } - bool mark_as_dependent(THD *thd, st_select_lex *last, Item *dependency); + bool mark_as_dependent(THD *thd, st_select_lex *last, + Item_ident *dependency); void set_braces(bool value) { |