diff options
| author | unknown <igor@rurik.mysql.com> | 2006-01-09 21:46:33 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-01-09 21:46:33 -0800 |
| commit | 09ddf79d33a99e5044fcae9f91181356e4908af1 (patch) | |
| tree | 5cb16389e0336d8623380c2e263483dd152b766b /sql | |
| parent | 8fd14af83afbd3bdf6886c3c9e4ecb8541842674 (diff) | |
| parent | 352d943bb63657aea56982f511d0c17e4a643759 (diff) | |
| download | mariadb-git-09ddf79d33a99e5044fcae9f91181356e4908af1.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
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 061020e1952..7bb84895da5 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1543,7 +1543,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); @@ -4638,7 +4639,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; |