From f1eaf7e8ec894a0fd0d54bf55e636f48179aaf7a Mon Sep 17 00:00:00 2001
From: "gluh@eagle.intranet.mysql.r18.ru" <>
Date: Mon, 6 Mar 2006 14:03:40 +0400
Subject: [PATCH] Fix for bug#14385 GRANT and mapping to correct user account
 problems   Check if the host of table hash record exactly matches host from
 GRANT command

---
 mysql-test/r/grant.result | 18 ++++++++++++++++++
 mysql-test/t/grant.test   | 16 ++++++++++++++++
 sql/sql_acl.cc            |  5 ++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 13593ec2a88..dffa4988ea7 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -473,3 +473,21 @@ GRANT USAGE ON *.* TO 'mysqltest_7'@'' IDENTIFIED BY PASSWORD '*2FB071A056F9BB74
 drop user mysqltest_7@;
 show grants for mysqltest_7@;
 ERROR 42000: There is no such grant defined for user 'mysqltest_7' on host ''
+create database mysqltest;
+use mysqltest;
+create table t1(f1 int);
+GRANT DELETE ON mysqltest.t1 TO mysqltest1@'%';
+GRANT SELECT ON mysqltest.t1 TO mysqltest1@'192.%';
+show grants for mysqltest1@'192.%';
+Grants for mysqltest1@192.%
+GRANT USAGE ON *.* TO 'mysqltest1'@'192.%'
+GRANT SELECT ON `mysqltest`.`t1` TO 'mysqltest1'@'192.%'
+show grants for mysqltest1@'%';
+Grants for mysqltest1@%
+GRANT USAGE ON *.* TO 'mysqltest1'@'%'
+GRANT DELETE ON `mysqltest`.`t1` TO 'mysqltest1'@'%'
+delete from mysql.user where user='mysqltest1';
+delete from mysql.db where user='mysqltest1';
+delete from mysql.tables_priv where user='mysqltest1';
+flush privileges;
+drop database mysqltest;
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index 805fa881399..60b60547fcc 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -433,4 +433,20 @@ drop user mysqltest_7@;
 --error 1141
 show grants for mysqltest_7@;
 
+#
+# Bug#14385: GRANT and mapping to correct user account problems
+#
+create database mysqltest;
+use mysqltest;
+create table t1(f1 int);
+GRANT DELETE ON mysqltest.t1 TO mysqltest1@'%';
+GRANT SELECT ON mysqltest.t1 TO mysqltest1@'192.%';
+show grants for mysqltest1@'192.%';
+show grants for mysqltest1@'%';
+delete from mysql.user where user='mysqltest1';
+delete from mysql.db where user='mysqltest1';
+delete from mysql.tables_priv where user='mysqltest1';
+flush privileges;
+drop database mysqltest;
+
 # End of 4.1 tests
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index c1847d010c5..4626e5892a4 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -2001,7 +2001,10 @@ static GRANT_TABLE *table_hash_search(const char *host,const char* ip,
   {
     if (exact)
     {
-      if (compare_hostname(&grant_table->host, host, ip))
+      if ((host &&
+	   !my_strcasecmp(system_charset_info, host,
+                          grant_table->host.hostname)) ||
+	  (ip && !strcmp(ip, grant_table->host.hostname)))
 	return grant_table;
     }
     else