database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge tulin@bk-internal.mysql.com:/tmp/mysql-4.1-ndbqc

Browse Source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-qc


sql/sql_cache.cc:
  Auto merged
This commit is contained in:
unknown
2004-11-25 19:13:40 +00:00
parent e0b469aa1d 93191c739e
commit 526a67fb50
3 changed files with 30 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_cache.cc
View File

@ -1087,7 +1087,6 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
DBUG_PRINT("qcache", ("Handler does not allow caching for %s.%s",
table_list.db, table_list.alias));
BLOCK_UNLOCK_RD(query_block);
thd->lex->safe_to_cache_query= 0; // Don't try to cache this
if (engine_data != table->engine_data())
{
DBUG_PRINT("qcache",
@ -1096,6 +1095,8 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
engine_data, table->engine_data()));
invalidate_table(table->db(), table->key_length());
}
else
thd->lex->safe_to_cache_query= 0; // Don't try to cache this
goto err_unlock; // Parse query
}
else