diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 11:33:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 11:33:59 +0300 |
| commit | 394784095eeedb3a2915249fe14a9d2e1f91a23a (patch) | |
| tree | 0a2e7ad98bfa382744d87c6af6eb91f4bfc3858d /sql/item.h | |
| parent | d7189fbcb4dadf23d615a5f3a26aba1d4e37178f (diff) | |
| parent | 4730314a70119ae5857edffe2d1bec86960ef22b (diff) | |
| download | mariadb-git-394784095eeedb3a2915249fe14a9d2e1f91a23a.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index ad455457934..9182b578cdb 100644 --- a/sql/item.h +++ b/sql/item.h @@ -3281,6 +3281,10 @@ public: const char *db_name; const char *table_name; LEX_CSTRING field_name; + /* + 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 */ /* Cached value of index for this field in table->field array, used by prep. @@ -5315,7 +5319,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); - const char *func_name(THD *thd) const; + const char *func_name(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); |