From: Jon Olav Hauglid Date: June 10 2011 8:44am Subject: bzr commit into mysql-5.5 branch (jon.hauglid:3440) Bug#12584161 List-Archive: http://lists.mysql.com/commits/139043 X-Bug: 12584161 Message-Id: <201106100845.p5A8j3tj022017@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1946982912470183530==" --===============1946982912470183530== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/x/mysql-5.5-bug12584161/ based on revid:dmitry.shulga@stripped 3440 Jon Olav Hauglid 2011-06-10 Bug#12584161 - 43861: MAIN.QUERY_CACHE_28249 FAILS SPORADICALLY This test case was failing on 5.5 and trunk for two reasons. 1) It waited for the "Waiting for table level lock" process state while this state was renamed "Waiting for table metadata lock" with the introduction of MDL in 5.5. 2) SET GLOBAL query_cache_size= 100000; gave a warning since query_cache_size is supposed to be multiples of 1024. This patch fixes these two issues and re-enables the test case. modified: mysql-test/r/query_cache_28249.result mysql-test/t/disabled.def mysql-test/t/query_cache_28249.test === modified file 'mysql-test/r/query_cache_28249.result' --- a/mysql-test/r/query_cache_28249.result 2008-11-28 15:45:34 +0000 +++ b/mysql-test/r/query_cache_28249.result 2011-06-10 08:44:42 +0000 @@ -8,7 +8,7 @@ SET @query_cache_size= @@global. SET GLOBAL query_cache_type=1; SET GLOBAL query_cache_limit=10000; SET GLOBAL query_cache_min_res_unit=0; -SET GLOBAL query_cache_size= 100000; +SET GLOBAL query_cache_size= 102400; FLUSH TABLES; DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 (a INT); @@ -23,10 +23,10 @@ SELECT *, (SELECT COUNT(*) FROM t2) FROM # Switch to connection user3 # Poll till the select of connection user1 is blocked by the write lock on t1. SELECT user,command,state,info FROM information_schema.processlist -WHERE state = 'Locked' +WHERE state = 'Waiting for table metadata lock' AND info = 'SELECT *, (SELECT COUNT(*) FROM t2) FROM t1'; user command state info -root Query Locked SELECT *, (SELECT COUNT(*) FROM t2) FROM t1 +root Query Waiting for table metadata lock SELECT *, (SELECT COUNT(*) FROM t2) FROM t1 INSERT INTO t1 VALUES (4); # Switch to connection user2 UNLOCK TABLES; === modified file 'mysql-test/t/disabled.def' --- a/mysql-test/t/disabled.def 2011-06-06 10:24:28 +0000 +++ b/mysql-test/t/disabled.def 2011-06-10 08:44:42 +0000 @@ -15,5 +15,4 @@ sum_distinct-big : Bug#11764126 alter_table-big : Bug#11748731 2010-11-15 mattiasj was not tested create-big : Bug#11748731 2010-11-15 mattiasj was not tested archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc -main.query_cache_28249 : Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists === modified file 'mysql-test/t/query_cache_28249.test' --- a/mysql-test/t/query_cache_28249.test 2010-08-06 11:29:37 +0000 +++ b/mysql-test/t/query_cache_28249.test 2011-06-10 08:44:42 +0000 @@ -30,7 +30,7 @@ connection user1; SET GLOBAL query_cache_type=1; SET GLOBAL query_cache_limit=10000; SET GLOBAL query_cache_min_res_unit=0; -SET GLOBAL query_cache_size= 100000; +SET GLOBAL query_cache_size= 102400; FLUSH TABLES; --disable_warnings @@ -58,18 +58,18 @@ connection user3; # Typical information_schema.processlist content after sufficient sleep time # ID USER COMMAND TIME STATE INFO # .... -# 2 root Query 5 Waiting for table level lock SELECT *, (SELECT COUNT(*) FROM t2) FROM t1 +# 2 root Query 5 Waiting for table metadata lock SELECT *, (SELECT COUNT(*) FROM t2) FROM t1 # .... # XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX # The values marked with 'X' must be reached. --echo # Poll till the select of connection user1 is blocked by the write lock on t1. let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist -WHERE state = 'Waiting for table level lock' +WHERE state = 'Waiting for table metadata lock' AND info = '$select_for_qc'; --source include/wait_condition.inc eval SELECT user,command,state,info FROM information_schema.processlist -WHERE state = 'Waiting for table level lock' +WHERE state = 'Waiting for table metadata lock' AND info = '$select_for_qc'; INSERT INTO t1 VALUES (4); --===============1946982912470183530== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/jon.hauglid@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@stripped # target_branch: file:///export/home/x/mysql-5.5-bug12584161/ # testament_sha1: d02689afa540c113f39ae007151478440e57e4fd # timestamp: 2011-06-10 10:44:50 +0200 # base_revision_id: dmitry.shulga@stripped\ # ie1fg12b4adfcjc3 # # Begin bundle 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 AA== --===============1946982912470183530==--