diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-09-28 18:56:15 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-09-28 18:56:15 +0400 |
| commit | 67eb1252ac7e6520ffe3dc2acdf5da705d1fa175 (patch) | |
| tree | 0d8a01c61b7f3d6a541579beeb16687095c03d30 /sql/sp_head.h | |
| parent | 4a32e2395e1ff6cf7274d0567282b1747031108b (diff) | |
| parent | 7131a0a80373eeb38fb6f7124f90dcc7a0f187ac (diff) | |
| download | mariadb-git-67eb1252ac7e6520ffe3dc2acdf5da705d1fa175.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 977e20a07b9..c3ace46a789 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -214,8 +214,12 @@ public: m_sp_cache_version= version_arg; } - sp_rcontext *rcontext_create(THD *thd, Field *retval); - + sp_rcontext *rcontext_create(THD *thd, Field *retval, List<Item> *args); + sp_rcontext *rcontext_create(THD *thd, Field *retval, + Item **args, uint arg_count); + sp_rcontext *rcontext_create(THD *thd, Field *retval, + Row_definition_list *list, + bool switch_security_ctx); private: /** Version of the stored routine cache at the moment when the |