diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 17:46:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 17:46:40 +0300 |
| commit | fae0ccad6ec391bf85c39070f784589d48e11951 (patch) | |
| tree | b6a20ffe8c11a13edce1f0c7c46eb9c5ac3d2bab /sql/item.h | |
| parent | 1b558dd462d34e948f3a4d9e54af973e37a9746e (diff) | |
| parent | 620c55e708b9ea94ef8ba309267a6f2f32ed8104 (diff) | |
| download | mariadb-git-fae0ccad6ec391bf85c39070f784589d48e11951.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index 26ea1b17574..ab2c06b701c 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2,7 +2,7 @@ #define SQL_ITEM_INCLUDED /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2009, 2021, MariaDB Corporation. + Copyright (c) 2009, 2022, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3485,6 +3485,10 @@ public: this variable. */ bool can_be_depended; + /* + NOTE: came from TABLE::alias_name_used and this is only a hint! + See comment for TABLE::alias_name_used. + */ bool alias_name_used; /* true if item was resolved against alias */ Item_ident(THD *thd, Name_resolution_context *context_arg, @@ -5487,7 +5491,7 @@ public: Field *sp_result_field; Item_sp(THD *thd, Name_resolution_context *context_arg, sp_name *name_arg); Item_sp(THD *thd, Item_sp *item); - LEX_CSTRING func_name_cstring(THD *thd) const; + LEX_CSTRING func_name_cstring(THD *thd, bool is_package_function) const; void cleanup(); bool sp_check_access(THD *thd); bool execute(THD *thd, bool *null_value, Item **args, uint arg_count); |