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 polly.local:/home/kaa/src/maint/bug28895/my50-bug28895

Browse Source 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
This commit is contained in:
kaa@polly.local
2007-06-07 10:26:04 +04:00
parent d2fe24d1ef 35dd1fc535
commit c674243497
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_acl.cc
View File

@ -978,14 +978,15 @@ bool acl_getroot_no_password(Security_context *sctx, char *user, char *host,
*/
for (i=0 ; i < acl_users.elements ; i++)
{
acl_user= dynamic_element(&acl_users,i,ACL_USER*);
if ((!acl_user->user && !user[0]) ||
(acl_user->user && strcmp(user, acl_user->user) == 0))
ACL_USER *acl_user_tmp= dynamic_element(&acl_users,i,ACL_USER*);
if ((!acl_user_tmp->user && !user[0]) ||
(acl_user_tmp->user && strcmp(user, acl_user_tmp->user) == 0))
{
if (compare_hostname(&acl_user->host, host, ip))
if (compare_hostname(&acl_user_tmp->host, host, ip))
{
res= 0;
break;
acl_user= acl_user_tmp;
res= 0;
break;
}
}
}