summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-04-16 20:35:29 +0300
committerunknown <bell@sanja.is.com.ua>2003-04-16 20:35:29 +0300
commit48935d0536e28032a2ce021bd2c3e22ccf97cba7 (patch)
treee3388f92b12d4fbdfc30361d0fcde4c8f490ff05 /mysql-test
parentdf5ff1daeae5b07019afe4a0e820984d069071a6 (diff)
parentd4280aedcac74739511bfdc75cc8a25b0984ebd4 (diff)
downloadmariadb-git-48935d0536e28032a2ce021bd2c3e22ccf97cba7.tar.gz
merging
sql/ha_innodb.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/innodb_cache.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/innodb_cache.result b/mysql-test/r/innodb_cache.result
index 7d351a13e16..04540bebd1a 100644
--- a/mysql-test/r/innodb_cache.result
+++ b/mysql-test/r/innodb_cache.result
@@ -10,7 +10,7 @@ a
3
show status like "Qcache_queries_in_cache";
Variable_name Value
-Qcache_queries_in_cache 0
+Qcache_queries_in_cache 1
drop table t1;
commit;
set autocommit=1;
@@ -24,7 +24,7 @@ a
3
show status like "Qcache_queries_in_cache";
Variable_name Value
-Qcache_queries_in_cache 0
+Qcache_queries_in_cache 1
drop table t1;
commit;
create table t1 (a int not null) type=innodb;
@@ -97,7 +97,7 @@ Qcache_hits 0
commit;
show status like "Qcache_queries_in_cache";
Variable_name Value
-Qcache_queries_in_cache 1
+Qcache_queries_in_cache 3
drop table if exists t1;
CREATE TABLE t1 (id int(11) NOT NULL auto_increment, PRIMARY KEY (id)) TYPE=InnoDB;
select count(*) from t1;