database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328

Browse Source 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
This commit is contained in:
iggy@rolltop.ignatz42.dyndns.org
2006-08-16 19:31:33 -04:00
parent 38a36da86d a86f035a08
commit 00ab7be7b9
7 changed files with 74 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/sql_acl.cc
View File

@ -4693,6 +4693,32 @@ int open_grant_tables(THD *thd, TABLE_LIST *tables)
DBUG_RETURN(0);
}
ACL_USER *check_acl_user(LEX_USER *user_name,
uint *acl_acl_userdx)
{
ACL_USER *acl_user= 0;
uint counter;
safe_mutex_assert_owner(&acl_cache->lock);
for (counter= 0 ; counter < acl_users.elements ; counter++)
{
const char *user,*host;
acl_user= dynamic_element(&acl_users, counter, ACL_USER*);
if (!(user=acl_user->user))
user= "";
if (!(host=acl_user->host.hostname))
host= "";
if (!strcmp(user_name->user.str,user) &&
!my_strcasecmp(system_charset_info, user_name->host.str, host))
break;
}
if (counter == acl_users.elements)
return 0;
*acl_acl_userdx= counter;
return acl_user;
}
/*
Modify a privilege table.
@ -4741,7 +4767,6 @@ static int modify_grant_table(TABLE *table, Field *host_field,
DBUG_RETURN(error);
}
/*
Handle a privilege table.