Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

mysql-test/r/ndb_cache2.result

 drop table if exists t1;
 set GLOBAL query_cache_type=on;
 set GLOBAL query_cache_size=1355776;
-set GLOBAL ndb_cache_check_time=5;
+set GLOBAL ndb_cache_check_time=1;
 reset query cache;
 flush status;
 CREATE TABLE t1 ( pk int not null primary key,

mysql-test/t/ndb_cache2.test

@@ -10,7 +10,7 @@ drop table if exists t1;
 set GLOBAL query_cache_type=on;
 set GLOBAL query_cache_size=1355776;
 # Turn on thread that will fetch commit count for open tables
-set GLOBAL ndb_cache_check_time=5;
+set GLOBAL ndb_cache_check_time=1;
 reset query cache;
 flush status;