diff options
| author | unknown <igreenhoe/greenman@anubis.greendragongames.com> | 2006-07-13 16:35:25 -0700 |
|---|---|---|
| committer | unknown <igreenhoe/greenman@anubis.greendragongames.com> | 2006-07-13 16:35:25 -0700 |
| commit | 35bfad1e3db9d955a135035d4af6665f0331e811 (patch) | |
| tree | ade4a3fc40348d0802ec1bbd31d554eaa91edfd3 /sql/sql_acl.cc | |
| parent | 316577d69537d49d359a1928c6f54194aef19620 (diff) | |
| parent | 3c2bdb59bc19a62f08e9b778649d9f12a9c87eab (diff) | |
| download | mariadb-git-35bfad1e3db9d955a135035d4af6665f0331e811.tar.gz | |
4.1 -> 5.0 merge
client/mysql.cc:
Auto merged
client/sql_string.h:
Auto merged
configure.in:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
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 */ |