mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
bad merge fixed
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user