summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorigreenhoe/greenman@anubis.greendragongames.com <>2006-07-13 16:35:25 -0700
committerigreenhoe/greenman@anubis.greendragongames.com <>2006-07-13 16:35:25 -0700
commitabb75129f8318564be9730cb0b909702df9816ef (patch)
treeade4a3fc40348d0802ec1bbd31d554eaa91edfd3 /sql/sql_acl.cc
parent878107eb4a232cf5097601bec3fa1e8c28d7aca6 (diff)
parentb4c8f536619d594326cdb7b9eade41262670358e (diff)
downloadmariadb-git-abb75129f8318564be9730cb0b909702df9816ef.tar.gz
4.1 -> 5.0 merge
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index f7dac349d8a..ae5ea210a47 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -149,8 +149,8 @@ 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,
- /* Use the case sensitive "binary" charset */
- &my_charset_bin);
+ lower_case_file_system ?
+ system_charset_info : &my_charset_bin);
if (dont_read_acl_tables)
{
DBUG_RETURN(0); /* purecov: tested */