Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ

1 files changed, 0 insertions, 11 deletions

diff --git a/mysql-test/t/query_cache_28249.test b/mysql-test/t/query_cache_28249.test
index b1be7c57343..a08371fe576 100644
--- a/mysql-test/t/query_cache_28249.test
+++ b/mysql-test/t/query_cache_28249.test
@@ -19,12 +19,10 @@ SET @query_cache_min_res_unit= @@global.query_cache_min_res_unit;
 SET @query_cache_size=         @@global.query_cache_size;
 
 --echo # Bug#28249 Query Cache returns wrong result with concurrent insert/ certain lock
---echo # Establish connections user1,user2,user3 (user=root)
 connect (user1,localhost,root,,test,,);
 connect (user2,localhost,root,,test,,);
 connect (user3,localhost,root,,test,,);
 
---echo # Switch to connection user1
 connection user1;
 
 SET GLOBAL query_cache_type=1;
@@ -40,11 +38,9 @@ CREATE TABLE t1 (a INT);
 CREATE TABLE t2 (a INT);
 INSERT INTO t1 VALUES (1),(2),(3);
 
---echo # Switch to connection user2
 connection user2;
 LOCK TABLE t2 WRITE;
 
---echo # Switch to connection user1
 connection user1;
 --echo # "send" the next select, "reap" the result later.
 --echo # The select will be blocked by the write lock on the t1.
@@ -53,7 +49,6 @@ SELECT *, (SELECT COUNT(*) FROM t2) FROM t1;
 send;
 eval $select_for_qc;
 
---echo # Switch to connection user3
 connection user3;
 # Typical information_schema.processlist content after sufficient sleep time
 #   ID  USER  COMMAND  TIME  STATE   INFO
@@ -73,11 +68,9 @@ WHERE state = 'Waiting for table metadata lock'
   AND info = '$select_for_qc';
 INSERT INTO t1 VALUES (4);
 
---echo # Switch to connection user2
 connection user2;
 UNLOCK TABLES;
 
---echo # Switch to connection user1
 connection user1;
 #
 # Since the lock ordering rule in thr_multi_lock depends on
@@ -95,13 +88,11 @@ connection user1;
 --reap
 --enable_result_log
 
---echo # Switch to connection user3
 connection user3;
 --echo # The next select enforces that effects of "concurrent_inserts" like the
 --echo # record with a = 4 is missing in result sets can no more happen.
 SELECT 1 FROM t1 WHERE a = 4;
 
---echo # Switch to connection user1
 connection user1;
 --echo # The next result set must contain 4 rows.
 # If not, we have a regression of Bug#28249
@@ -111,7 +102,6 @@ eval $select_for_qc;
 
 DROP TABLE t1,t2;
 
---echo # Switch to connection default + close connections user1,user2,user3
 connection default;
 disconnect user1;
 disconnect user2;
@@ -121,4 +111,3 @@ SET GLOBAL query_cache_type=         @query_cache_type;
 SET GLOBAL query_cache_limit=        @query_cache_limit;
 SET GLOBAL query_cache_min_res_unit= @query_cache_min_res_unit;
 SET GLOBAL query_cache_size=         @query_cache_size;
-