diff options
| author | unknown <serg@serg.mysql.com> | 2002-10-14 11:55:28 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-10-14 11:55:28 +0000 |
| commit | 83e64cca4ecbbc8b0b65d20f15ad1a135e3fba9d (patch) | |
| tree | ee39711669130d1ffe80c086afca3cf46e21ecda /sql | |
| parent | 425e06ea6d2ff721fc03c22a6eb54dcc6ce5a9c7 (diff) | |
| download | mariadb-git-83e64cca4ecbbc8b0b65d20f15ad1a135e3fba9d.tar.gz | |
bad merge fixed
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_cache.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 9fa534da799..5bdefbaaa30 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1401,13 +1401,13 @@ ulong Query_cache::init_cache() VOID(hash_init(&queries,system_charset_info,def_query_hash_size, 0, 0, query_cache_query_get_key, 0, 0)); #ifndef FN_NO_CASE_SENCE - VOID(hash_init(&tables,def_table_hash_size, 0, 0, + VOID(hash_init(&tables,system_charset_info,def_table_hash_size, 0, 0, query_cache_table_get_key, 0, 0)); #else // windows, OS/2 or other case insensitive file names work around - VOID(hash_init(&tables,def_table_hash_size, 0, 0, + VOID(hash_init(&tables,system_charset_info,def_table_hash_size, 0, 0, query_cache_table_get_key, 0, - (lower_case_table_names?0:HASH_CASE_INSENSITIVE))); + (lower_case_table_names?0:HASH_CASE_INSENSITIVE))); #endif queries_in_cache = 0; |