From: Marc Alff
Date: May 4 2010 7:44am
Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3162)
 Bug#53392
List-Archive: http://lists.mysql.com/commits/107244
X-Bug: 53392
Message-Id: <20100504074419.786D5521052@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_fajkOhqJXa3/sbzPIaapnQ)"

--Boundary_(ID_fajkOhqJXa3/sbzPIaapnQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-53392/ based on revid:marc.alff@stripped

 3162 Marc Alff	2010-05-04
      Bug#53392 Tests: perfschema.query_cache fails
      
      Before this fix, the test perfschema.query_cache could fail
      with spurious failures, depending on which test was executed in the same
      MTR run.
      
      With this fix, the test perfschema.query_cache resets the server
      status variables, to be independent of previous runs.
      
      In particular, Qcache_hit now has a predictable value.

    modified:
      mysql-test/suite/perfschema/r/query_cache.result
      mysql-test/suite/perfschema/t/query_cache.test
=== modified file 'mysql-test/suite/perfschema/r/query_cache.result'
--- a/mysql-test/suite/perfschema/r/query_cache.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/query_cache.result	2010-05-04 07:44:13 +0000
@@ -4,6 +4,7 @@ insert into t1 values (1), (2), (3);
 SET GLOBAL query_cache_size=1355776;
 flush query cache;
 reset query cache;
+flush status;
 select * from t1;
 a
 1

=== modified file 'mysql-test/suite/perfschema/t/query_cache.test'
--- a/mysql-test/suite/perfschema/t/query_cache.test	2010-05-04 06:53:22 +0000
+++ b/mysql-test/suite/perfschema/t/query_cache.test	2010-05-04 07:44:13 +0000
@@ -33,6 +33,8 @@ SET GLOBAL query_cache_size=1355776;
 
 flush query cache;
 reset query cache;
+# Reset Qcache_* to a known state
+flush status;
 
 select * from t1;
 


--Boundary_(ID_fajkOhqJXa3/sbzPIaapnQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/marc.alff@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/marc.alff@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   53392/
# testament_sha1: e496bb43f7ae935c4d3da2d50d3ea98872b1016b
# timestamp: 2010-05-04 01:44:18 -0600
# base_revision_id: marc.alff@stripped\
#   86kc4r7hj3cyg87n
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcd0waIAAkNfgEAQWXf//3Ii
NIC////wUAT4VvUDu2IVVtzWoSUk8kwmU9JtGp5MmiejQQaAAGQSSnqGQJppqaaG1GQGgNGgA0AS
miCmRppR6YnkUxB6mmg9Riep5I0A5gEwAmAAEwABMAASSEaaBPU0ZGhGptI9CMI00ADS7P5ZzVLd
ihfjVwJ4bLMjZWTXKmTS8pLgmGulFY2zy7Stvlxvt1N9SokmS5fcPzKkXwZpP7FoETvlbZ17tnTi
r9dJeMOj+uc+g/lCkcauXHLGDNLuVcbKDo8c8jnYhxTCJaCc5nwlKdtdnyfe/V6/VUlEi8ng/X9G
Z5YwAXdX1vLviufkM0GRNYoEKppEwxg/NPOBDtrvaKSnPRLeM0SQN2MhtbRog+wXisvOp3MjMKcQ
umb6dwI1EiQOlCRJyw+gICn0ApSQFMok1QRYBi4coPKTuiVCyjeljFKlgVpzcljalvohc6+wDzqN
kg1qhFJlRuDmvhsaC25Mj0hUCIJYltJrLSnAJE5SHYJ6IeAsyBQOJARA2yqdXWBSKUmDQxOoeUtI
6DcEB9sLLMqQcCZZUgSRtAheAyUzPNYF5YONhxAwNp/NQdopVNnNrAVR4QvUyioPLZkSMZxCJuMY
0lDV7BNWcAzpBxtJhI8mDdjFrd2mgvfE86gLtBJzi0NJoOISDRc4jTSVTKdRgFh2BMdXrIlZMYYt
wM86sqxp7Cok1RVkl8cqyzwqp5dIOiTkPwG07E1iXiwp1sHElbMC19wiEkGHFvjdE3KJ43DN2RcJ
JlzV6akzzX6UI2IGsTE2ZkOt7qKAieK4G8yFEXE3HQby8qHFpucawOdpN3wpGnShYtRKBsK75ikg
RpVQGwSl5v2LHBTLRbYJTgRMf3tUIbqDQRlg8ZCcvNT5J1b+YtaWVJdZR3A8YbJTzQci4pFigNEb
JZkjQmeyE3ES1DjrzFyDqeZWgeBcDw7B0SQHAxIFt/uLd6o8+XLYYHU5HF+bITxMXkl7eo0D+wtX
aTqV9hYqEZj/TfTPNuJzisjCg1JhOHNplQuLA2KCM95+MIYkhN3vUl3uEdGcUR3GfDe8PixrGDgc
s5AJYlWPkJpHLMksy9S4hRRGLAZ5431lW691bO8JgaUnw/XsPDh0mxzWAM8TXwE5MDAXMsPGB2+w
HAL6EOymBnTVa6EBg8qc1iTBpjOKGYsPD8tbRkg0Z6RkDa/XnNROVILSBEWZSLrDFF2X3sRx1DTj
EhPIe5SJJzWK6ZrZSDgJbV9+mxfA8DB6pWhG7KYWzq3b6eVaf7bEduocDFuGajGlKrUzSab1364r
kKLCZQ5ncLGW1JUuYDtgj1QooqD0ctEqj4HHz8FiwwwB4TLIOqgsvcooGq72p9lomYZste+Piczg
1og0TpKTH0OBddYpruuUtZPUotRRSsz0hPOTRkE4mBe2Rk2CsVDTEEOJdBZg2x5tQhrmsYGIRDLH
NQamSe9ilDhnkteu2tY2lYrc7dkkSBAOiKIPw03ramCVxuE8WXSnBYi4JucQYI3JzSLXVuoPXivx
Z7FSzNHCYvTkLi65UTc0oiOm2JhaKjWRZhV3XCc5hHmA8N1rZVLpfLX/xdyRThQkMd0waIA=


--Boundary_(ID_fajkOhqJXa3/sbzPIaapnQ)--