diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-06-23 16:23:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-06-23 16:23:51 +0200 |
| commit | 242e7f958d7a174d29b06c1c0893c14448111645 (patch) | |
| tree | 3eaa2229d07693d117f1952cdc694a812ea60fc0 /sql/sql_acl.h | |
| parent | f321d3e5f1433092b9152165ffb74f60783168ec (diff) | |
| download | mariadb-git-242e7f958d7a174d29b06c1c0893c14448111645.tar.gz | |
MDEV-4549 [PATCH] Clean up code working with ACL tables
* enum values to index different ACL tables, instead of hard-coded numbers
(even different in diffent functions).
* move TABLE_LIST initialization into open_grant_tables()
and use it everywhere
* change few my_bool's to bool's
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 1aeb123153e..3f628b5a082 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -197,8 +197,8 @@ static inline int access_denied_error_code(int passwd_used) /* prototypes */ bool hostname_requires_resolving(const char *hostname); -my_bool acl_init(bool dont_read_acl_tables); -my_bool acl_reload(THD *thd); +bool acl_init(bool dont_read_acl_tables); +bool acl_reload(THD *thd); void acl_free(bool end=0); ulong acl_get(const char *host, const char *ip, const char *user, const char *db, my_bool db_is_pattern); @@ -220,9 +220,9 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table, List <LEX_USER> &user_list, bool mysql_routine_grant(THD *thd, TABLE_LIST *table, bool is_proc, List <LEX_USER> &user_list, ulong rights, bool revoke, bool write_to_binlog); -my_bool grant_init(); +bool grant_init(); void grant_free(void); -my_bool grant_reload(THD *thd); +bool grant_reload(THD *thd); bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables, bool any_combination_will_do, uint number, bool no_errors); bool check_grant_column (THD *thd, GRANT_INFO *grant, |