Skip to content

M
mariadb
Commit 688aaf41 authored by bar@bar.mysql.r18.ru's avatar bar@bar.mysql.r18.ru
Browse files
Options

sql_cache.cc: 

  Windows compilation fix
parent b5af8d77
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
sql/sql_cache.cc
View file @ 688aaf41
...@@ -1404,9 +1404,9 @@ ulong Query_cache::init_cache() ...@@ -1404,9 +1404,9 @@ ulong Query_cache::init_cache()
query_cache_table_get_key, 0, 0)); query_cache_table_get_key, 0, 0));
#else #else
// windows, OS/2 or other case insensitive file names work around // windows, OS/2 or other case insensitive file names work around
VOID(hash_init(&tables,system_charset_info,def_table_hash_size, 0, 0, VOID(hash_init(&tables,
query_cache_table_get_key, 0, lower_case_table_names ? &my_charset_bin : system_charset_info,
(lower_case_table_names?0:HASH_CASE_INSENSITIVE))); def_table_hash_size, 0, 0,query_cache_table_get_key, 0, 0));
#endif #endif
queries_in_cache = 0; queries_in_cache = 0;
...@@ -2476,10 +2476,8 @@ TABLE_COUNTER_TYPE Query_cache::is_cacheable(THD *thd, uint32 query_len, ...@@ -2476,10 +2476,8 @@ TABLE_COUNTER_TYPE Query_cache::is_cacheable(THD *thd, uint32 query_len,
tables_used->table->tmp_table != NO_TMP_TABLE || tables_used->table->tmp_table != NO_TMP_TABLE ||
(tables_used->db_length == 5 && (tables_used->db_length == 5 &&
#ifdef FN_NO_CASE_SENCE #ifdef FN_NO_CASE_SENCE
// TODO: latin1 charset should be replaced with system charset my_strnncoll(system_charset_info, tables_used->db, 6,
my_strncasecmp(&my_charset_latin1, "mysql",6) == 0
tables_used->db,
"mysql",5) == 0
#else #else
tables_used->db[0]=='m' && tables_used->db[0]=='m' &&
tables_used->db[1]=='y' && tables_used->db[1]=='y' &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7