diff options
| author | Igor Babaev <igor@askmonty.org> | 2017-08-10 16:23:26 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2017-08-10 16:23:26 -0700 |
| commit | 5a71e6bd5a61dff6d549d2c4f5927bbbd7ebcfee (patch) | |
| tree | 98ca05164f4a2bf2fce6e1644bc6335193e69bbd /sql/sql_lex.h | |
| parent | 1710dd2bf286f9a240f380925a0067c57c1b29f9 (diff) | |
| parent | bf75dcac89d1496032015526dc6ce78d327e329f (diff) | |
| download | mariadb-git-bb-10-ext-mdev-13369.tar.gz | |
Merge branch 'bb-10.2-ext' into bb-10-ext-mdev-13369bb-10-ext-mdev-13369
# Conflicts:
# mysql-test/r/derived_cond_pushdown.result
# mysql-test/t/derived_cond_pushdown.test
# sql/sql_derived.cc
# sql/sql_select.cc
# sql/sql_select.h
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 d92decd12e2..6bd7f78822c 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -3154,9 +3154,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) @@ -3174,6 +3176,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, @@ -3652,6 +3658,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); }; |