summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/query_cache_notembedded.result16
-rw-r--r--mysql-test/t/query_cache_notembedded.test29
2 files changed, 0 insertions, 45 deletions
diff --git a/mysql-test/r/query_cache_notembedded.result b/mysql-test/r/query_cache_notembedded.result
index bf582bfaec6..8e5df012cfb 100644
--- a/mysql-test/r/query_cache_notembedded.result
+++ b/mysql-test/r/query_cache_notembedded.result
@@ -345,19 +345,3 @@ 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;
diff --git a/mysql-test/t/query_cache_notembedded.test b/mysql-test/t/query_cache_notembedded.test
index d98ed691c7b..112856117ce 100644
--- a/mysql-test/t/query_cache_notembedded.test
+++ b/mysql-test/t/query_cache_notembedded.test
@@ -230,35 +230,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
# Wait till we reached the initial number of concurrent sessions