diff options
| author | unknown <lars@mysql.com> | 2005-03-21 09:23:09 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-03-21 09:23:09 +0100 |
| commit | 6f772bf5442ca97aadd56f0ae996425539780423 (patch) | |
| tree | e5380d658d6281a18a5a3a64498370116ab723fc /sql/sql_acl.h | |
| parent | 48c880f83a66473b2f85349fa8ad0772641a467b (diff) | |
| parent | 2ba3544f0e053d95e82b9a899fd9b86cbb19b9ce (diff) | |
| download | mariadb-git-6f772bf5442ca97aadd56f0ae996425539780423.tar.gz | |
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
BitKeeper/etc/logging_ok:
auto-union
sql/sql_acl.h:
Auto merged
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index c346837ea9e..fd22da2a9fc 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -189,6 +189,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table, List <LEX_USER> &user_list, bool mysql_procedure_grant(THD *thd, TABLE_LIST *table, List <LEX_USER> &user_list, ulong rights, bool revoke, bool no_error); +ACL_USER *check_acl_user(LEX_USER *user_name, + uint *acl_acl_userdx); my_bool grant_init(THD *thd); void grant_free(void); void grant_reload(THD *thd); |