diff options
| author | unknown <monty@mysql.com> | 2006-01-09 18:52:22 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-01-09 18:52:22 +0200 |
| commit | ce221a703cfdf106c237fece7e480bcdfbef0198 (patch) | |
| tree | 1ef141cc6c470bbdee3deeb6a2123689fe9e02d7 /sql | |
| parent | e12bc697db8509602cd7c765fbd95d8543ad6308 (diff) | |
| parent | 0b5e8a801caf979f174cd1dcf2efb498682aad12 (diff) | |
| download | mariadb-git-ce221a703cfdf106c237fece7e480bcdfbef0198.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_acl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 74f7a1dcf06..c1847d010c5 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1371,7 +1371,8 @@ find_acl_user(const char *host, const char *user, my_bool exact) acl_user->user && !strcmp(user,acl_user->user)) { if (exact ? !my_strcasecmp(&my_charset_latin1, host, - acl_user->host.hostname) : + acl_user->host.hostname ? + acl_user->host.hostname : "") : compare_hostname(&acl_user->host,host,host)) { DBUG_RETURN(acl_user); @@ -3605,7 +3606,7 @@ ACL_USER *check_acl_user(LEX_USER *user_name, if (!(user=acl_user->user)) user= ""; if (!(host=acl_user->host.hostname)) - host= "%"; + host= ""; if (!strcmp(user_name->user.str,user) && !my_strcasecmp(system_charset_info, user_name->host.str, host)) break; |