From: Marc Alff
Date: May 4 2010 8:08am
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3163)
List-Archive: http://lists.mysql.com/commits/107253
Message-Id: <20100504080833.D7F4F5211C2@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_bULkc/1vORHHycMcGwQmKA)"

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

 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/myisam_file_io.result'
--- a/mysql-test/suite/perfschema/r/myisam_file_io.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/myisam_file_io.result	2010-05-04 07:44:57 +0000
@@ -4,6 +4,7 @@ update performance_schema.SETUP_INSTRUME
 update performance_schema.SETUP_CONSUMERS
 set enabled='YES';
 truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
+flush status;
 drop table if exists test.no_index_tab;
 create table test.no_index_tab ( a varchar(255), b int ) engine=myisam;
 insert into no_index_tab set a = 'foo', b = 1;

=== modified file 'mysql-test/suite/perfschema/t/myisam_file_io.test'
--- a/mysql-test/suite/perfschema/t/myisam_file_io.test	2010-05-04 06:53:22 +0000
+++ b/mysql-test/suite/perfschema/t/myisam_file_io.test	2010-05-04 07:44:57 +0000
@@ -29,6 +29,9 @@ update performance_schema.SETUP_CONSUMER
 
 truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
 
+# Reset lost counters to a known state
+flush status;
+
 # Code to test
 
 --disable_warnings


--Boundary_(ID_bULkc/1vORHHycMcGwQmKA)
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-\
#   53394/
# testament_sha1: e1ae80712f70be284cf7f25b0ce644ca3293fc3d
# timestamp: 2010-05-04 02:08:33 -0600
# base_revision_id: marc.alff@stripped\
#   h4d42yajhj02gaaf
# 
# Begin bundle
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


--Boundary_(ID_bULkc/1vORHHycMcGwQmKA)--