--- a/sql/sql_acl.cc	Fri Mar 23 11:12:09 2007
+++ b/sql/sql_acl.cc	Wed May 23 16:20:01 2007
@@ -146,12 +146,11 @@
   DBUG_ENTER("acl_init");
 
   acl_cache= new hash_filo(ACL_CACHE_SIZE, 0, 0,
                            (hash_get_key) acl_entry_get_key,
                            (hash_free_key) free,
-                           lower_case_file_system ?
-                           system_charset_info : &my_charset_bin);
+                          &my_charset_bin);
   if (dont_read_acl_tables)
   {
     DBUG_RETURN(0); /* purecov: tested */
   }
 
--- a/mysql-test/t/grant3.test	Mon May 21 07:50:00 2007
+++ b/mysql-test/t/grant3.test	Wed May 23 13:42:27 2007
@@ -32,5 +32,31 @@
 delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
 delete from mysql.tables_priv where user like 'mysqltest\_%';
 delete from mysql.columns_priv where user like 'mysqltest\_%';
 flush privileges;
+#
+# acl_cache: user not casesensitive, with lower_case_file_system
+# did fail on windows
+#
+
+create database d1;
+create database d2;
+create table d1.t1 (a int);
+create table d2.t1 (a int);
+grant select on `d1`.* to user1@localhost;
+grant select on `d2`.* to USER1@localhost;
+FLUSH PRIVILEGES;
+
+connect (connu1,localhost,user1,,d1)
+
+--error 1044
+connect (connu2,localhost,USER1,,d1)
+
+disconnect connu1;
+
+connection master;
+drop database d1;
+drop database d2;
+
+DROP USER user1@localhost;
+DROP USER USER1@LOCALHOST;
--- a/mysql-test/r/grant3.result	Mon May 21 07:50:01 2007
+++ b/mysql-test/r/grant3.result	Wed May 23 13:39:42 2007
@@ -14,5 +14,16 @@
 delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
 delete from mysql.tables_priv where user like 'mysqltest\_%';
 delete from mysql.columns_priv where user like 'mysqltest\_%';
 flush privileges;
+create database d1;
+create database d2;
+create table d1.t1 (a int);
+create table d2.t1 (a int);
+grant select on `d1`.* to user1@localhost;
+grant select on `d2`.* to USER1@localhost;
+FLUSH PRIVILEGES;
+drop database d1;
+drop database d2;
+DROP USER user1@localhost;
+DROP USER USER1@LOCALHOST;