diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-02-18 16:27:04 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-02-18 16:27:04 +0200 |
| commit | 64236d3bddb4bd9f80e5ae01acb6b4f6db64ed97 (patch) | |
| tree | 3f9f0668fb7fe23ecd8ed297b232142a25686abc /sql/sql_cache.cc | |
| parent | 826c4ccba5d8ac5fe12571c5cb9a453ba6d2360c (diff) | |
| download | mariadb-git-64236d3bddb4bd9f80e5ae01acb6b4f6db64ed97.tar.gz | |
aftermerging fix
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 8bc74942bc0..99bd3d64585 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -757,6 +757,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used) DBUG_ENTER("Query_cache::store_query"); if (query_cache_size == 0) DBUG_VOID_RETURN; + uint8 tables_type= 0; if ((local_tables = is_cacheable(thd, thd->query_length, thd->query, &thd->lex, tables_used, @@ -1001,7 +1002,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) DBUG_PRINT("qcache", ("Need to check column privileges 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 + thd->lex.safe_to_cache_query= 0; // Don't try to cache this goto err_unlock; // Parse query } if (check_tables && !handler::caching_allowed(thd, table->db(), @@ -1011,7 +1012,7 @@ 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->safe_to_cache_query=0; // Don't try to cache this + thd->lex.safe_to_cache_query= 0; // Don't try to cache this goto err_unlock; // Parse query } else |