bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3163)

[Marc Alff]

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

 3163 Marc Alff	2010-05-04 [merge]
      local merge

    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;
 


Attachment: [text/bzr-bundle] bzr/[e-mail]