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

1 files changed, 10 insertions, 10 deletions

diff --git a/mysql-test/t/ndb_cache2.test b/mysql-test/t/ndb_cache2.test
index 5c1674a7021..c46935e8601 100644
--- a/mysql-test/t/ndb_cache2.test
+++ b/mysql-test/t/ndb_cache2.test
@@ -41,10 +41,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 desc;
 show status like "Qcache_inserts";
 show status like "Qcache_hits";
-select * from t1;
+select * from t1 order by pk desc;
 show status like "Qcache_hits";
 
 # Perform a "new" query and make sure the query cache is not hit
@@ -66,7 +66,7 @@ show status like "Qcache_hits";
 connect (con1,localhost,root,,);
 connection con1;
 use test;
-select * from t1;
+select * from t1 order by pk desc;
 select * from t1 where b=3;
 show status like "Qcache_hits";
 
@@ -76,13 +76,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";
@@ -95,7 +95,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";
@@ -107,11 +107,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";