bk commit into 4.1 tree (bar:1.2534)

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2534 06/07/07 12:17:00 bar@stripped +1 -0
  Merge abarkov@stripped:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b17647

  sql/sql_acl.cc
    1.176 06/07/07 12:16:53 bar@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1.b17647/RESYNC

--- 1.175/sql/sql_acl.cc	2006-04-27 15:54:31 +05:00
+++ 1.176/sql/sql_acl.cc	2006-07-07 12:16:53 +05:00
@@ -146,7 +146,9 @@ my_bool acl_init(bool dont_read_acl_tabl
 
   acl_cache= new hash_filo(ACL_CACHE_SIZE, 0, 0,
                            (hash_get_key) acl_entry_get_key,
-                           (hash_free_key) free, system_charset_info);
+                           (hash_free_key) free,
+                           lower_case_file_system ?
+                           system_charset_info : &my_charset_bin);
   if (dont_read_acl_tables)
   {
     DBUG_RETURN(0); /* purecov: tested */