bzr commit into mysql-trunk-bugfixing branch (marc.alff:3123) Bug#53392

[Marc Alff]

#At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-cleanup/ based on revid:marc.alff@stripped

 3123 Marc Alff	2010-07-16
      Bug#53392 Tests: perfschema.query_cache fails
      
      Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)

    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-07-16 14:28:19 +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-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/t/query_cache.test	2010-07-16 14:28:19 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Sun Microsystems, Inc
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -10,8 +10,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, write to the Free Software Foundation,
+# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
 
 # Tests for PERFORMANCE_SCHEMA
 
@@ -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]