bzr push into mysql-6.0-bugteam branch (davi:2984 to 2985)

[Davi Arnaut]

 2985 Davi Arnaut	2009-01-28 [merge]
      Merge from 5.1-bugteam
modified:
  mysql-test/r/query_cache_notembedded.result
  mysql-test/t/query_cache_notembedded.test

 2984 Georgi Kodinov	2009-01-28 [merge]
      merged 5.1-bugteam -> 6.0-bugteam
removed:
  mysql-test/std_data/server-cert-des.pem
  mysql-test/std_data/server-key-des.pem
modified:
  mysql-test/include/setup_fake_relay_log.inc
  mysql-test/r/openssl_1.result
  mysql-test/std_data/cacert.pem
  mysql-test/std_data/client-cert.pem
  mysql-test/std_data/client-key.pem
  mysql-test/std_data/server-cert.pem
  mysql-test/std_data/server-key.pem
  mysql-test/std_data/server8k-cert.pem
  mysql-test/std_data/server8k-key.pem
  mysql-test/suite/rpl/t/rpl_cross_version-master.opt
  mysql-test/t/openssl_1.test
  sql/handler.cc

=== modified file 'mysql-test/r/query_cache_notembedded.result'
--- a/mysql-test/r/query_cache_notembedded.result	2009-01-22 12:22:16 +0000
+++ b/mysql-test/r/query_cache_notembedded.result	2009-01-28 17:49:02 +0000
@@ -347,22 +347,6 @@ id
 drop table t1;
 drop function f1;
 set GLOBAL query_cache_size=0;
-DROP TABLE IF EXISTS t1;
-FLUSH STATUS;
-SET GLOBAL query_cache_size=1048576;
-CREATE TABLE t1 (a INT);
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
-SHOW STATUS LIKE 'Qcache_queries_in_cache';
-Variable_name	Value
-Qcache_queries_in_cache	0
-LOCK TABLES t1 WRITE;
-SELECT * FROM t1;
-UNLOCK TABLES;
-SHOW STATUS LIKE 'Qcache_queries_in_cache';
-Variable_name	Value
-Qcache_queries_in_cache	0
-DROP TABLE t1;
-SET GLOBAL query_cache_size= default;
 SET GLOBAL log_bin_trust_function_creators = 0;
 DROP DATABASE IF EXISTS bug30269;
 FLUSH STATUS;

=== modified file 'mysql-test/t/query_cache_notembedded.test'
--- a/mysql-test/t/query_cache_notembedded.test	2009-01-22 12:22:16 +0000
+++ b/mysql-test/t/query_cache_notembedded.test	2009-01-28 17:49:02 +0000
@@ -226,35 +226,6 @@ connection default;
 
 set GLOBAL query_cache_size=0;
 
-#
-# Bug#40264: Aborted cached query causes query to hang indefinitely on next cache hit
-#
-
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
-FLUSH STATUS;
-SET GLOBAL query_cache_size=1048576;
-CREATE TABLE t1 (a INT);
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
-SHOW STATUS LIKE 'Qcache_queries_in_cache';
-LOCK TABLES t1 WRITE;
-connect(con1,localhost,root,,);
---send SELECT * FROM t1
-connection default;
-let $show_type= open tables where `table`='t1' and in_use=2;
-let $show_pattern= '%t1%2%';
---source include/wait_show_pattern.inc
-dirty_close con1;
-UNLOCK TABLES;
-let $show_type= open tables where `table`='t1' and in_use=0;
-let $show_pattern= '%t1%0%';
---source include/wait_show_pattern.inc
-SHOW STATUS LIKE 'Qcache_queries_in_cache';
-DROP TABLE t1;
-SET GLOBAL query_cache_size= default;
-
 # End of 5.0 tests
 
 SET GLOBAL log_bin_trust_function_creators = 0;