summaryrefslogtreecommitdiff
path: root/mysql-test/r/ndb_cache2.result
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.homeip.net>2005-02-04 10:56:53 +0100
committerunknown <msvensson@neptunus.homeip.net>2005-02-04 10:56:53 +0100
commit03bc59970610527a86a76ed5e8b993a6a3769d09 (patch)
treec5a13a7369a48df8d68e09e6a1c49a02dc2841c2 /mysql-test/r/ndb_cache2.result
parent2b0a3dbe9e935762db81f9d08721417584197ff4 (diff)
downloadmariadb-git-03bc59970610527a86a76ed5e8b993a6a3769d09.tar.gz
Merge of query cache from 4.1 to 5.0
mysql-test/r/ndb_cache.result: Added 'order by' to select's mysql-test/r/ndb_cache2.result: Added 'order by' to select's mysql-test/t/ndb_cache.test: Added 'order by' to select's mysql-test/t/ndb_cache2.test: Added 'order by' to select's sql/ha_innodb.h: Changed function name sql/ha_ndbcluster.cc: Merge from query cache from 4.1 to 5.0 Added better comments ndb_get_table_statistics had changed, so there where some adaptions to make sql/ha_ndbcluster.h: Changed name of function sql/handler.h: Changed name of function sql/sql_cache.cc: Changed name of function
Diffstat (limited to 'mysql-test/r/ndb_cache2.result')
-rw-r--r--mysql-test/r/ndb_cache2.result24
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/r/ndb_cache2.result b/mysql-test/r/ndb_cache2.result
index ce10e9dab00..de4b3e31874 100644
--- a/mysql-test/r/ndb_cache2.result
+++ b/mysql-test/r/ndb_cache2.result
@@ -37,10 +37,10 @@ Variable_name Value
Qcache_hits 1
insert into t1 value (2, 7, 8, 'Second row');
insert into t1 value (4, 5, 6, 'Fourth row');
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
-2 7 8 Second row
4 5 6 Fourth row
+2 7 8 Second row
1 3 3 First row
show status like "Qcache_inserts";
Variable_name Value
@@ -48,10 +48,10 @@ Qcache_inserts 3
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 1
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
-2 7 8 Second row
4 5 6 Fourth row
+2 7 8 Second row
1 3 3 First row
show status like "Qcache_hits";
Variable_name Value
@@ -82,7 +82,7 @@ show status like "Qcache_hits";
Variable_name Value
Qcache_hits 3
use test;
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
2 7 8 Second row
1 3 3 First row
@@ -97,11 +97,11 @@ use test;
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 0
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
2 7 8 Second row
1 4 3 First row
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
2 7 8 Second row
1 4 3 First row
@@ -111,11 +111,11 @@ Qcache_inserts 7
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 5
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
2 7 8 Second row
1 4 3 First row
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
2 7 8 Second row
1 4 3 First row
@@ -139,7 +139,7 @@ Qcache_inserts 7
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 7
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
2 7 8 Second row
1 4 3 First row
@@ -162,7 +162,7 @@ Qcache_inserts 8
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 7
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
2 7 8 Second row
1 5 3 First row
@@ -172,7 +172,7 @@ Qcache_inserts 9
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 7
-select * from t1;
+select * from t1 order by pk desc;
pk a b c
2 7 8 Second row
1 5 3 First row