diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-08-08 03:29:36 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-08-08 03:29:36 +0300 |
| commit | a6b15fdd7682bffc2e197ac50e21332bb9bcf297 (patch) | |
| tree | da5d29e4a08217e2773b16c5aef05ab734c760e4 /sql/sql_cache.cc | |
| parent | 93f5a0616ab15113844fa211a26c44182af8018c (diff) | |
| parent | f01f49916b7a0ea6eaf9f0e4e1dfad911584f8a2 (diff) | |
| download | mariadb-git-a6b15fdd7682bffc2e197ac50e21332bb9bcf297.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
include/my_sys.h:
Auto merged
innobase/include/dyn0dyn.h:
Auto merged
innobase/include/dyn0dyn.ic:
Auto merged
myisam/mi_check.c:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 6cfcff8a7ff..c25a7e5afe4 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -873,10 +873,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) (thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) || thd->variables.query_cache_type == 0) - { - DBUG_PRINT("qcache", ("query cache disabled or not in autocommit mode")); goto err; - } /* Check that we haven't forgot to reset the query cache variables */ DBUG_ASSERT(thd->net.query_cache_query == 0); @@ -1021,6 +1018,7 @@ err: DBUG_RETURN(0); // Query was not cached } + /* Remove all cached queries that uses any of the tables in the list */ |