diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-30 20:47:39 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-30 20:47:39 +0400 |
| commit | 835cbbcc7b797188a89671019f2b2844e1a14e0c (patch) | |
| tree | 010dd112f16b88bb655c32abb6b93987fe5c6c99 /sql/sp_rcontext.h | |
| parent | fe8cf8fdf1c4c0a9ec60690a8d2738fd255c8dd5 (diff) | |
| parent | 003cb2f42477772ae43228c0bc0f8492246b9340 (diff) | |
| download | mariadb-git-835cbbcc7b797188a89671019f2b2844e1a14e0c.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
TODO: enable MDEV-13049 optimization for 10.3
Diffstat (limited to 'sql/sp_rcontext.h')
| -rw-r--r-- | sql/sp_rcontext.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h index 66df0359d28..658972ece40 100644 --- a/sql/sp_rcontext.h +++ b/sql/sp_rcontext.h @@ -70,6 +70,7 @@ public: /// /// @return valid sp_rcontext object or NULL in case of OOM-error. static sp_rcontext *create(THD *thd, + const sp_head *owner, const sp_pcontext *root_parsing_ctx, Field *return_value_fld, Row_definition_list &defs); @@ -77,7 +78,8 @@ public: ~sp_rcontext(); private: - sp_rcontext(const sp_pcontext *root_parsing_ctx, + sp_rcontext(const sp_head *owner, + const sp_pcontext *root_parsing_ctx, Field *return_value_fld, bool in_sub_stmt); @@ -179,7 +181,8 @@ public: /// The stored program for which this runtime context is created. Used for /// checking if correct runtime context is used for variable handling. - sp_head *sp; + /// Also used by slow log. + const sp_head *m_sp; ///////////////////////////////////////////////////////////////////////// // SP-variables. |