From: Marc Alff
Date: July 16 2010 2:28pm
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3123) Bug#53392
List-Archive: http://lists.mysql.com/commits/113759
X-Bug: 53392
Message-Id: <20100716142823.492F345E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6133001513856418585=="

--===============6133001513856418585==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;
 


--===============6133001513856418585==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   cleanup/
# testament_sha1: 5cdc5fd50caa24b228f9ae04346622c3a841fc1d
# timestamp: 2010-07-16 08:28:23 -0600
# base_revision_id: marc.alff@stripped\
#   rqyr08pxcq2gis1c
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdI4WL0AAldfgAAQWHf//3sC
vgC////wUAStb3QGN7va65Xdd273DJCBNMjRtBohNGnoQAbUPSDEEopoambUap4m1INMQ0aAAAAA
lBAoTZTxJkwgyNNAAAAASKKn6RppPU9IekGamnqeoDIaA0DRoCSgRkEwmpjCRpimnqeoZAAaA444
3W1qCfL2eoTtVmawIX38z8oJqHlAtHKcsJEuLhx+4Mh20URV9sfmhOJNFxQLcT2x4ZtWq3aGclc/
jt59ql6+qxkYuZlUtdsEAFPPFbe7hxjtE7yhdKFHjnwCwIVXac2FNu5n0SNLnaxZdCOVENYQ2BPw
tq9ZbGmWIuonAcZ1TtQvCAcbJTG/PwRO42C48LLi3WJVGgLFgto6pxfyGY3VmILn1VMQqZEDXNQQ
iA8nAaWEoX1IiseMGzKSRDJNaDlKBX95E8zRYFSIj2o1UcowYkHOmKkWaUvnAfBBtkBKFbJ6PX5G
VQ5zJwmvSIgfmt5Qy2lIkA8y3ddrQKbjUaKg7OyCDWYsNSQOAx2v3KqN7SMw0lSURAdHhbHIJ0dB
aDinzWc9OMBj7HC0sVd+qrE0KiFcw3fg/QiZZmJAcwkrrWqJabnAFaMB44V1Q0weXGwp7N5OVqwe
SIlwwDEWAExv8S8qWus9l8Lk2whNXbPayapr7xFpFRDEyyMWldMFlcVMEseRSpUQzLSNaITivezB
iUKWl5IWEyUKOyAQIYRK6iFbOHwtR60gMzytnxzFxOaAJWlVaxUmmcZcC4DTS++9ysWrSpZSCJZB
Gk4LNZJJCcloa9iZNeYwHGZXVVV2knxiXxqoL+EabZ6xue0wg19NEexKmBUNGLq4Js7NDYZG4UIi
z4OKjtOJvP9UB05+pC9Eol+ECNFwJueZUKlLSKbTWCeeUlQhxK7Fiah2UOAnuRurdyFcBXoYljnL
C3qwYbaiYlLSlr5xZyp8uTMBzODCW9YJj6HYC0RZqo1YsdklIhAhARZCPtGss9OoWNybWUgoIwil
3ddZwFgo/8auw5zYVZCtWrrKkNI73seObLfM8jXpKopXJnwUMkJlKAb2zyaETWSuyDlWwpzYYK+g
5GudE+FGo4GZRvOs4l48TtcodySpVHmcyRPx4CeXwOTMObn5MpE2ouU2428hompNAkysd3FhYjQw
OAGWdJtu8hH57C+KCaHg9FeRJu8XNZDQRPOdhGdvlZ33yLoC2ZMZAXeBwAxRCiaP1VBoqwGNQ9oW
k1owTB68olHLCPDvxlBT7paJSdHGvY8EyFiliTGwGW9CCadwaRmklYoRJkUIQm7KzkI2wKhTMJQW
5yL+FT7sxpKaTRorkbK9gK8ihdxBas1fNVdwpcgQBZrXBXGxj/uX2nWYxfqzoERplhsZgdB6PIDr
89kQBm5qWvUtfNypOlbuftA1KnHfFvoUKGTDWppWxucYKFg8mCVTJEFPQX0MvF8O+pT5xhiVOBBw
4htWOG9bhejGiBwY6MMEQe0ex8qVhSXSI5RCyI6dICMmxZFd1FVAT5DbeJLFE49DUwQiwzsC82EI
JqH3UCi3NXekCcUuYmILVNyWEVPtA/4u5IpwoSGkcLF6


--===============6133001513856418585==--