database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed bug in query cache after temporary table creation.

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2002-08-07 15:29:49 +03:00
parent cf30288ddf
commit 011fed6059
4 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/manual.texi
View File

@ -50147,6 +50147,8 @@ each individual 4.0.x release.
@itemize @bullet @itemize @bullet
@item @item
Fixed bug in query cache after temporary table creation.
@item
Fixed bug in multi-table @code{UPDATE}: when updating a table, Fixed bug in multi-table @code{UPDATE}: when updating a table,
@code{do_select()} became confused about reading records from a cache. @code{do_select()} became confused about reading records from a cache.
@item @item

20
mysql-test/r/query_cache.result
View File

@ -506,3 +506,23 @@ set GLOBAL query_cache_size=1900;
show global variables like "query_cache_size"; show global variables like "query_cache_size";
Variable_name Value Variable_name Value
query_cache_size 1024 query_cache_size 1024
set GLOBAL query_cache_size=1048576;
create table t1 (i int not null);
create table t2 (i int not null);
select * from t1;
i
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 1
create temporary table t3 (i int not null);
select * from t2;
i
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 2
select * from t3;
i
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 2
drop table t1, t2, t3;

15
mysql-test/t/query_cache.test
View File

@ -352,3 +352,18 @@ set GLOBAL query_cache_size=1700;
set GLOBAL query_cache_size=1800; set GLOBAL query_cache_size=1800;
set GLOBAL query_cache_size=1900; set GLOBAL query_cache_size=1900;
show global variables like "query_cache_size"; show global variables like "query_cache_size";
#
# Temporary tables
#
set GLOBAL query_cache_size=1048576;
create table t1 (i int not null);
create table t2 (i int not null);
select * from t1;
show status like "Qcache_queries_in_cache";
create temporary table t3 (i int not null);
select * from t2;
show status like "Qcache_queries_in_cache";
select * from t3;
show status like "Qcache_queries_in_cache";
drop table t1, t2, t3;

7
sql/sql_cache.cc
View File

@ -2395,7 +2395,6 @@ TABLE_COUNTER_TYPE Query_cache::is_cacheable(THD *thd, uint32 query_len,
DBUG_ENTER("Query_cache::is_cacheable"); DBUG_ENTER("Query_cache::is_cacheable");
if (lex->sql_command == SQLCOM_SELECT && if (lex->sql_command == SQLCOM_SELECT &&
thd->temporary_tables == 0 &&
(thd->variables.query_cache_type == 1 || (thd->variables.query_cache_type == 1 ||
(thd->variables.query_cache_type == 2 && (lex->select->options & (thd->variables.query_cache_type == 2 && (lex->select->options &
OPTION_TO_QUERY_CACHE))) && OPTION_TO_QUERY_CACHE))) &&
@ -2416,9 +2415,11 @@ TABLE_COUNTER_TYPE Query_cache::is_cacheable(THD *thd, uint32 query_len,
has_transactions = (has_transactions || has_transactions = (has_transactions ||
tables_used->table->file->has_transactions()); tables_used->table->file->has_transactions());
if (tables_used->table->db_type == DB_TYPE_MRG_ISAM) if (tables_used->table->db_type == DB_TYPE_MRG_ISAM ||
tables_used->table->tmp_table != NO_TMP_TABLE)
{ {
DBUG_PRINT("qcache", ("select not cacheable: used MRG_ISAM table(s)")); DBUG_PRINT("qcache",
("select not cacheable: used MRG_ISAM or temporary table(s)"));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
if (tables_used->table->db_type == DB_TYPE_MRG_MYISAM) if (tables_used->table->db_type == DB_TYPE_MRG_MYISAM)