diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 08:17:56 -0700 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 08:17:56 -0700 |
| commit | 06e16b8c97209ea3c913d0de9e956fe89b09ebd7 (patch) | |
| tree | c743f8bf7dd5e102c7720edd2fc804a492f4fd9a /sql/sql_acl.h | |
| parent | cdb5510204f7d04242bb11e8d97509627af8afc0 (diff) | |
| download | mariadb-git-06e16b8c97209ea3c913d0de9e956fe89b09ebd7.tar.gz | |
cannot use lex->grant_user= ¤t_user, where LEX_USER current_user is a global constant,
because parser might modify the lex->user (e.g. set lex->user-password).
switch to use LEX_STRING current_user string, and also change other similar constants
to be LEX_STRING's for consistency.
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 8a2054cee90..8a6c6cba307 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -173,11 +173,11 @@ enum mysql_db_table_field extern const TABLE_FIELD_DEF mysql_db_table_def; extern bool mysql_user_table_is_in_short_password_format; -extern const char *HOST_NOT_SPECIFIED; -extern const char *NONE_ROLE; -extern LEX_USER current_user; -extern LEX_USER current_role; -extern LEX_USER current_user_and_current_role; +extern LEX_STRING host_not_specified; +extern LEX_STRING none_role; +extern LEX_STRING current_user; +extern LEX_STRING current_role; +extern LEX_STRING current_user_and_current_role; static inline int access_denied_error_code(int passwd_used) |