diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 10:33:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 10:33:59 +0300 |
| commit | 5008171b05e0d3b8b5f4af312b94a312281e77c7 (patch) | |
| tree | 4a551df68976e937d18a7416d799c7a5605cb12f /sql/item.h | |
| parent | 61f84bba603aa85957b48d151f9ddf5ba4e71ab1 (diff) | |
| parent | 13d0641710802bd57b0c0d88c9fc321932014994 (diff) | |
| download | mariadb-git-5008171b05e0d3b8b5f4af312b94a312281e77c7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 9b55a515691..717e49e5b33 100644 --- a/sql/item.h +++ b/sql/item.h @@ -7400,7 +7400,8 @@ void mark_select_range_as_dependent(THD *thd, st_select_lex *last_select, st_select_lex *current_sel, Field *found_field, Item *found_item, - Item_ident *resolved_item); + Item_ident *resolved_item, + bool suppress_warning_output); extern Cached_item *new_Cached_item(THD *thd, Item *item, bool pass_through_ref); |