diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /sql/sp_rcontext.cc | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index d2fe53a2..6c8111a1 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -23,6 +23,7 @@ #include "mysql.h" #include "sp_head.h" #include "sql_cursor.h" +#include "sp_instr.h" // class sp_instr, ... #include "sp_rcontext.h" #include "sp_pcontext.h" #include "sql_select.h" // create_virtual_tmp_table @@ -62,11 +63,11 @@ const LEX_CSTRING *Sp_rcontext_handler_package_body::get_name_prefix() const /////////////////////////////////////////////////////////////////////////// -sp_rcontext::sp_rcontext(const sp_head *owner, +sp_rcontext::sp_rcontext(sp_head *owner, const sp_pcontext *root_parsing_ctx, Field *return_value_fld, bool in_sub_stmt) - :end_partial_result_set(false), + :callers_arena(nullptr), end_partial_result_set(false), pause_state(false), quit_func(false), instr_ptr(0), m_sp(owner), m_root_parsing_ctx(root_parsing_ctx), @@ -90,7 +91,7 @@ sp_rcontext::~sp_rcontext() sp_rcontext *sp_rcontext::create(THD *thd, - const sp_head *owner, + sp_head *owner, const sp_pcontext *root_parsing_ctx, Field *return_value_fld, Row_definition_list &field_def_lst) @@ -225,7 +226,8 @@ check_column_grant_for_type_ref(THD *thd, TABLE_LIST *table_list, /** This method implementation is very close to fill_schema_table_by_open(). */ -bool Qualified_column_ident::resolve_type_ref(THD *thd, Column_definition *def) +bool Qualified_column_ident::resolve_type_ref(THD *thd, + Column_definition *def) const { Open_tables_backup open_tables_state_backup; thd->reset_n_backup_open_tables_state(&open_tables_state_backup); @@ -243,7 +245,7 @@ bool Qualified_column_ident::resolve_type_ref(THD *thd, Column_definition *def) thd->temporary_tables= open_tables_state_backup.temporary_tables; if ((table_list= - lex.first_select_lex()->add_table_to_list(thd, this, NULL, 0, + lex.first_select_lex()->add_table_to_list(thd, (Table_ident*)this, NULL, 0, TL_READ_NO_INSERT, MDL_SHARED_READ)) && !check_table_access(thd, SELECT_ACL, table_list, TRUE, UINT_MAX, FALSE) && |