diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-25 19:13:40 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-25 19:13:40 +0000 |
| commit | 526a67fb506d67a62607eb520ddf7d3a33172ef6 (patch) | |
| tree | 6ee9a968a486efdf745429af9e49044bf168e541 /sql/sql_cache.cc | |
| parent | e0b469aa1d9827fe722904d974bf1c7b2c3021cc (diff) | |
| parent | 93191c739e8302c312d283169c736867cf8327b3 (diff) | |
| download | mariadb-git-526a67fb506d67a62607eb520ddf7d3a33172ef6.tar.gz | |
Merge tulin@bk-internal.mysql.com:/tmp/mysql-4.1-ndbqc
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-qc
sql/sql_cache.cc:
Auto merged
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 5c2698bcef2..fa2fb0283f9 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -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 |