diff options
| author | msvensson@neptunus.(none) <> | 2006-05-29 15:05:31 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-05-29 15:05:31 +0200 |
| commit | 3e2c08cc99b29f30021062c05bca514c9d20b614 (patch) | |
| tree | 0d41717c8178e064c005be4ebfd8b50daec857af /sql/sql_acl.cc | |
| parent | 20e0714176aed89406b95902ae37171feeb8d372 (diff) | |
| download | mariadb-git-3e2c08cc99b29f30021062c05bca514c9d20b614.tar.gz | |
Update after merge to 5.0
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 1cf326e2bc3..244e2d45393 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2273,7 +2273,8 @@ static GRANT_NAME *name_hash_search(HASH *name_hash, { if (exact) { - if ((host && + if (!grant_name->host.hostname || + (host && !my_strcasecmp(system_charset_info, host, grant_name->host.hostname)) || (ip && !strcmp(ip, grant_name->host.hostname))) @@ -4956,6 +4957,9 @@ static int handle_grant_struct(uint struct_no, bool drop, } if (! user) user= ""; + if (! host) + host= ""; + #ifdef EXTRA_DEBUG DBUG_PRINT("loop",("scan struct: %u index: %u user: '%s' host: '%s'", struct_no, idx, user, host)); |