diff options
| author | unknown <bar@mysql.com> | 2006-07-07 12:17:00 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-07-07 12:17:00 +0500 |
| commit | 28729caaf61f6cfb9a1a77c576a4fc70d7be3dc0 (patch) | |
| tree | 494d6e5b006604ecebd7a3643581b51a2b9b3fbf /sql/sql_acl.cc | |
| parent | 4cb0659de2b9d434cfe92b48b409dadee62fa7df (diff) | |
| parent | af2f9b90fa7e90468eadfbb24256b0be87dd5184 (diff) | |
| download | mariadb-git-28729caaf61f6cfb9a1a77c576a4fc70d7be3dc0.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b17647
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
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 */ |