database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

43
mysql-test/r/ndb_cache.result
View File

@ -1,43 +0,0 @@
set GLOBAL query_cache_size=1355776;
reset query cache;
flush status;
drop table if exists t1,t2;
CREATE TABLE t1 (a int) ENGINE=ndbcluster;
CREATE TABLE t2 (a int);
select * from t1;
a
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 0
show status like "Qcache_inserts";
Variable_name Value
Qcache_inserts 0
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 0
select * from t2;
a
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 1
show status like "Qcache_inserts";
Variable_name Value
Qcache_inserts 1
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 0
select * from t1;
a
select * from t2;
a
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 1
show status like "Qcache_inserts";
Variable_name Value
Qcache_inserts 1
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 1
drop table t1, t2;
SET GLOBAL query_cache_size=0;

38
mysql-test/t/ndb_cache.test
View File

@ -1,31 +1,49 @@
-- source include/have_query_cache.inc -- source include/have_query_cache.inc
-- source include/have_ndb.inc -- source include/have_ndb.inc
set GLOBAL ndb_query_cache_type=on;
# following line have to be removed when ndb_query_cache_type will made
# global only
set ndb_query_cache_type=on;
set GLOBAL query_cache_size=1355776; set GLOBAL query_cache_size=1355776;
reset query cache; reset query cache;
flush status; flush status;
--disable_warnings --disable_warnings
drop table if exists t1,t2; drop table if exists t1;
--enable_warnings --enable_warnings
CREATE TABLE t1 (a int) ENGINE=ndbcluster; CREATE TABLE t1 (a int) ENGINE=ndbcluster;
CREATE TABLE t2 (a int); insert into t1 value (2);
select * from t1; select * from t1;
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
show status like "Qcache_inserts"; show status like "Qcache_inserts";
show status like "Qcache_hits"; show status like "Qcache_hits";
select * from t2; connect (con1,localhost,root,,);
show status like "Qcache_queries_in_cache"; connection con1;
show status like "Qcache_inserts"; use test;
show status like "Qcache_hits"; set autocommit=0;
update t1 set a=3;
connect (con2,localhost,root,,);
connection con2;
select * from t1;
select * from t1; select * from t1;
select * from t2;
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
show status like "Qcache_inserts"; show status like "Qcache_inserts";
show status like "Qcache_hits"; show status like "Qcache_hits";
connection con1;
select * from t1;
select * from t1;
show status like "Qcache_queries_in_cache";
show status like "Qcache_inserts";
show status like "Qcache_hits";
commit;
connection con2;
select * from t1;
select * from t1;
show status like "Qcache_queries_in_cache";
show status like "Qcache_inserts";
show status like "Qcache_hits";
drop table t1;
drop table t1, t2;
SET GLOBAL query_cache_size=0; SET GLOBAL query_cache_size=0;

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", DBUG_PRINT("qcache", ("Handler does not allow caching for %s.%s",
table_list.db, table_list.alias)); table_list.db, table_list.alias));
BLOCK_UNLOCK_RD(query_block); BLOCK_UNLOCK_RD(query_block);
thd->lex->safe_to_cache_query= 0; // Don't try to cache this
if (engine_data != table->engine_data()) if (engine_data != table->engine_data())
{ {
DBUG_PRINT("qcache", 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())); engine_data, table->engine_data()));
invalidate_table(table->db(), table->key_length()); 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 goto err_unlock; // Parse query
} }
else else