diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
| commit | 496e22cf3bd2a481fd3502d86e5a4e8228bf9823 (patch) | |
| tree | 80549f8005fcf3236bfa004a5aea35e4e67b36ca /sql/sql_parse.h | |
| parent | 45f484b8381a5923aec9c704e54c7f7bcfa02a40 (diff) | |
| parent | 26f56089c734852dc31d98fd73e1d8f1750bd1a8 (diff) | |
| download | mariadb-git-496e22cf3bd2a481fd3502d86e5a4e8228bf9823.tar.gz | |
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
Diffstat (limited to 'sql/sql_parse.h')
| -rw-r--r-- | sql/sql_parse.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index 9ecdd5b53bb..c2a7a184c20 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -62,10 +62,11 @@ Comp_creator *comp_ne_creator(bool invert); int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident, enum enum_schema_tables schema_table_idx); -void get_default_definer(THD *thd, LEX_USER *definer); -LEX_USER *create_default_definer(THD *thd); +void get_default_definer(THD *thd, LEX_USER *definer, bool role); +LEX_USER *create_default_definer(THD *thd, bool role); LEX_USER *create_definer(THD *thd, LEX_STRING *user_name, LEX_STRING *host_name); -LEX_USER *get_current_user(THD *thd, LEX_USER *user); +LEX_USER *get_current_user(THD *thd, LEX_USER *user, bool lock=true); +bool sp_process_definer(THD *thd); bool check_string_byte_length(LEX_STRING *str, const char *err_msg, uint max_byte_length); bool check_string_char_length(LEX_STRING *str, const char *err_msg, @@ -83,7 +84,7 @@ bool alloc_query(THD *thd, const char *packet, uint packet_length); void mysql_init_select(LEX *lex); void mysql_parse(THD *thd, char *rawbuf, uint length, Parser_state *parser_state); -void mysql_reset_thd_for_next_command(THD *thd, my_bool calculate_userstat); +void mysql_reset_thd_for_next_command(THD *thd); bool mysql_new_select(LEX *lex, bool move_down); void create_select_for_variable(const char *var_name); void create_table_set_open_action_and_adjust_tables(LEX *lex); |