diff options
author | unknown <bar@bar.mysql.r18.ru> | 2003-04-03 14:52:12 +0500 |
---|---|---|
committer | unknown <bar@bar.mysql.r18.ru> | 2003-04-03 14:52:12 +0500 |
commit | d352328a38bb4d259d71bc00fea0bfe3c4dc581f (patch) | |
tree | 0dcd353d147c1fd9d01af760cf83aa58bbd016d3 /sql/sql_cache.cc | |
parent | 1e8cc909de55b33b7a73ebfa7186598c1a7dbba3 (diff) | |
download | mariadb-git-d352328a38bb4d259d71bc00fea0bfe3c4dc581f.tar.gz |
sql_cache.cc:
Windows compilation fix
sql/sql_cache.cc:
Windows compilation fix
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r-- | sql/sql_cache.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index ecfbcc7cd83..664df11a968 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1404,9 +1404,9 @@ ulong Query_cache::init_cache() query_cache_table_get_key, 0, 0)); #else // windows, OS/2 or other case insensitive file names work around - 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))); + VOID(hash_init(&tables, + lower_case_table_names ? &my_charset_bin : system_charset_info, + def_table_hash_size, 0, 0,query_cache_table_get_key, 0, 0)); #endif queries_in_cache = 0; @@ -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->db_length == 5 && #ifdef FN_NO_CASE_SENCE - // TODO: latin1 charset should be replaced with system charset - my_strncasecmp(&my_charset_latin1, - tables_used->db, - "mysql",5) == 0 + my_strnncoll(system_charset_info, tables_used->db, 6, + "mysql",6) == 0 #else tables_used->db[0]=='m' && tables_used->db[1]=='y' && |