diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-09 12:59:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-09 12:59:39 +0300 |
| commit | 620ba97cfc2e3db00c3f8e423ad92e24d255af8f (patch) | |
| tree | a92a6e5d17675a7f8b4e2a75f2373ab77cf7c6ee /sql/sql_lex.h | |
| parent | f717fb824228d83a6cffc4164d64f40732197066 (diff) | |
| parent | 6685cdc2501b47a97a1135fa144f78696a2f10da (diff) | |
| download | mariadb-git-620ba97cfc2e3db00c3f8e423ad92e24d255af8f.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 4fe740185d5..f715f848c4b 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -3153,9 +3153,11 @@ public: bool set_trigger_new_row(LEX_CSTRING *name, Item *val); bool set_system_variable(struct sys_var_with_base *tmp, enum enum_var_type var_type, Item *val); + bool set_user_variable(THD *thd, const LEX_CSTRING *name, Item *val); void set_stmt_init(); - sp_name *make_sp_name(THD *thd, LEX_CSTRING *name); - sp_name *make_sp_name(THD *thd, LEX_CSTRING *name1, LEX_CSTRING *name2); + sp_name *make_sp_name(THD *thd, const LEX_CSTRING *name); + sp_name *make_sp_name(THD *thd, const LEX_CSTRING *name1, + const LEX_CSTRING *name2); sp_head *make_sp_head(THD *thd, const sp_name *name, const Sp_handler *sph); sp_head *make_sp_head_no_recursive(THD *thd, const sp_name *name, const Sp_handler *sph) @@ -3173,6 +3175,10 @@ public: return NULL; return make_sp_head_no_recursive(thd, name, sph); } + bool call_statement_start(THD *thd, sp_name *name); + bool call_statement_start(THD *thd, const LEX_CSTRING *name); + bool call_statement_start(THD *thd, const LEX_CSTRING *name1, + const LEX_CSTRING *name2); bool init_internal_variable(struct sys_var_with_base *variable, const LEX_CSTRING *name); bool init_internal_variable(struct sys_var_with_base *variable, @@ -3651,6 +3657,9 @@ public: bool add_create_view(THD *thd, DDL_options_st ddl, uint16 algorithm, enum_view_suid suid, Table_ident *table_ident); + + bool add_grant_command(THD *thd, enum_sql_command sql_command_arg, + stored_procedure_type type_arg); }; |