Merge of query cache from 4.1 to 5.0

1 files changed, 10 insertions, 10 deletions

diff --git a/mysql-test/t/ndb_cache.test b/mysql-test/t/ndb_cache.test
index 8bdcbe17728..e899e94e4ac 100644
--- a/mysql-test/t/ndb_cache.test
+++ b/mysql-test/t/ndb_cache.test
@@ -35,10 +35,10 @@ show status like "Qcache_hits";
 # Insert a new record and make sure the correct data is returned
 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;
 show status like "Qcache_inserts";
 show status like "Qcache_hits";
-select * from t1;
+select * from t1 order by pk;
 show status like "Qcache_hits";
 
 # Perform a "new" query and make sure the query cache is not hit
@@ -60,7 +60,7 @@ show status like "Qcache_hits";
 connect (con1,localhost,root,,);
 connection con1;
 use test;
-select * from t1;
+select * from t1 order by pk;
 select * from t1 where b=3;
 show status like "Qcache_hits";
 
@@ -70,13 +70,13 @@ connect (con2,localhost,root,,);
 connection con2;
 use test;
 show status like "Qcache_queries_in_cache";
-select * from t1;
-select * from t1;
+select * from t1 order by pk desc;
+select * from t1 order by pk desc;
 show status like "Qcache_inserts";
 show status like "Qcache_hits";
 connection con1;
-select * from t1;
-select * from t1;
+select * from t1 order by pk desc;
+select * from t1 order by pk desc;
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";
 show status like "Qcache_hits";
@@ -92,7 +92,7 @@ show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";
 show status like "Qcache_hits";
 connection con2;
-select * from t1;
+select * from t1 order by pk desc;
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";
 show status like "Qcache_hits";
@@ -103,11 +103,11 @@ show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";
 show status like "Qcache_hits";
 connection con2;
-select * from t1;
+select * from t1 order by pk desc;
 show status like "Qcache_inserts";
 show status like "Qcache_hits";
 connection con1;
-select * from t1;
+select * from t1 order by pk desc;
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";
 show status like "Qcache_hits";