summaryrefslogtreecommitdiff
path: root/sql/sql_acl.h
diff options
context:
space:
mode:
authorjani@ua141d10.elisa.omakaista.fi <>2006-05-09 20:50:29 +0300
committerjani@ua141d10.elisa.omakaista.fi <>2006-05-09 20:50:29 +0300
commit083f8455c7767d1fbec7caef41bac12df0303716 (patch)
treeee3755ece547e22530426e7c62dd99fe5716dedd /sql/sql_acl.h
parent49a78b8bcf5fa49cc69df6783fac0a0ff23bee14 (diff)
parent820673481593b7f2597e6506cee798a5769511bf (diff)
downloadmariadb-git-083f8455c7767d1fbec7caef41bac12df0303716.tar.gz
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
Diffstat (limited to 'sql/sql_acl.h')
-rw-r--r--sql/sql_acl.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index 8c64adbbece..e1153522ed5 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -236,7 +236,6 @@ bool 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 no_error);
-ACL_USER *check_acl_user(LEX_USER *user_name, uint *acl_acl_userdx);
my_bool grant_init();
void grant_free(void);
my_bool grant_reload(THD *thd);