summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorbar@mysql.com <>2006-07-07 12:17:00 +0500
committerbar@mysql.com <>2006-07-07 12:17:00 +0500
commit2303077238b32703749dc6f9d6f184ff30f9e251 (patch)
tree494d6e5b006604ecebd7a3643581b51a2b9b3fbf /sql/sql_acl.cc
parent0db71aaf983bbdb1df79c715e11078591789545e (diff)
parent51eec5cf9b888a020918440e79cb458eb7cdc2d4 (diff)
downloadmariadb-git-2303077238b32703749dc6f9d6f184ff30f9e251.tar.gz
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b17647
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 204a38dfb64..734bccb6b46 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -146,7 +146,9 @@ my_bool acl_init(bool dont_read_acl_tables)
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 */