diff options
| author | hf@deer.mysql.r18.ru <> | 2003-01-20 18:59:45 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-01-20 18:59:45 +0400 |
| commit | 389680e04e059cf78d3d7c929cb35c20064381fa (patch) | |
| tree | 26bff9a8e2da794ce9796009e2fbd0d050252445 /sql/sql_cache.cc | |
| parent | 1f6b6156773ae42f45cb2552cecbf52ef6964e23 (diff) | |
| parent | d14db3961d7f6839dd211ed3c136ddd8c709778c (diff) | |
| download | mariadb-git-389680e04e059cf78d3d7c929cb35c20064381fa.tar.gz | |
Conflicts resolving
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 2089b381156..ef763bbeffe 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -357,12 +357,6 @@ TODO list: #define DUMP(C) #endif -#ifdef FN_NO_CASE_SENCE -#define DB_NAME_PREPROCESS(C) tolower(C) -#else -#define DB_NAME_PREPROCESS(C) (C) -#endif - const char *query_cache_type_names[]= { "OFF", "ON", "DEMAND",NullS }; TYPELIB query_cache_type_typelib= { @@ -2480,12 +2474,18 @@ TABLE_COUNTER_TYPE Query_cache::is_cacheable(THD *thd, uint32 query_len, if (tables_used->table->db_type == DB_TYPE_MRG_ISAM || tables_used->table->tmp_table != NO_TMP_TABLE || - (tables_used->db_length == 5 && - DB_NAME_PREPROCESS(tables_used->db[0])=='m' && - DB_NAME_PREPROCESS(tables_used->db[1])=='y' && - DB_NAME_PREPROCESS(tables_used->db[2])=='s' && - DB_NAME_PREPROCESS(tables_used->db[3])=='q' && - DB_NAME_PREPROCESS(tables_used->db[4])=='l')) + (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 +#else + tables_used->db[0]=='m' && + tables_used->db[1]=='y' && + tables_used->db[2]=='s' && + tables_used->db[3]=='q' && + tables_used->db[4]=='l' +#endif + )) { DBUG_PRINT("qcache", ("select not cacheable: used MRG_ISAM, temporary or system table(s)")); |