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

--Boundary_(ID_tsvpsqwnGdyhs8W5ewXyJw)
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-53394/ based on revid:marc.alff@stripped

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

    modified:
      mysql-test/suite/perfschema/r/myisam_file_io.result
      mysql-test/suite/perfschema/t/myisam_file_io.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_tsvpsqwnGdyhs8W5ewXyJw)
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: 0576727f2bb750ee81e64d118d3306eceafeb47f
# timestamp: 2010-05-04 01:45:02 -0600
# base_revision_id: marc.alff@stripped\
#   86kc4r7hj3cyg87n
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWemThp0AAkJfgEAQWXf//3Ii
FIC////wUAUMV7pozO4bNSTQwklGTU9U9TU8U/EyPQlHpPKe1RhA9RptE9QSSlN6U9pP0p6oeo09
RiA0MhpiaNNMQCU0QmqeU9JiGymJplD0hppoNNNlHqA5gAJgACYAAAAACSTSDTQCaRtU9oKh+VM1
PCTEPUAM91fnoKn35mIc9vSDbZowVqZRa59cnvbwZCj7p4xvo1Oil3H0+tMG+hYJJkvX8B+pUhz2
wO6MybJFe1+zpVyu3a/OT0P65wzH8sKR6W1gc9cIL75+Crh0WDo88t5wuQ4phEric5kpSe2mzB9/
Xs391ST2T3moVnkA89UMy37PTI4+dWH+JtxUnN8yKFteUsXBDC2Mb+GwTAZ5a8JaRmiSBtrbRsGl
mmfbWILcrWMHYIeB12976PilFkKCQOAwERMQ6gt0AVYlkdz+S2dCu1hl5RWzCTDNJKLAnZK5FLFO
cGskaT5VF5UpMQoPbpNqEXG8vCsrP7ezSgLgRNJ1eVkjGmBILTaUiGSdGwuA5aRJ+foB8LeFfB8d
wpUl+ZURUOcRaXnVP2FKF5Ag5At4CyF1vRGq1nDEYCCa1GIHgBFLU23K1z/Lg8xS28S4FrNbzCkP
nuwMgKMC0oMdByozJzkPYLC/icjwzDiukDMLDlQGed+uwEcX+swKWMy+BcDFh1C0LvICE3J18Y1B
aHCEpVMcRSDxKIRsJj23mK3IDl2wYyAZIyYnF1VQnCDqCKajKeqgyWljF4NJqR8VGb5CZxBs/LeN
8TconjcM2y+SSTLiuhNTlTkpafBg52tM6SGbjGTXKeVNaVbEajbRNsNB3Gfvg5MR69vlhghUGruJ
ioci9ZCWb7vEWqnPmq2aZPEtIFjeTqQV/HU8T1MwY0OOBbr+X/C6paa8oCXxIPgOMcPYOpzN4oz5
Qa7kGTshNzEtygS3ixDm54mmRuOB5GIUA155lwDl8Z6qP058+uRfwDZ9WSUtD0OhoRLKD0H7F69T
OlY2goo449D7PTng3aQFQ0HlMzshnHWXmmG53B6V1HDLLpKjLxhqtg4xhbBENd93wkYkjdASpWce
cTePRYknli/R3EVzQMW7hOJa6rYJl38n8GoA8ArSnd6by7DE4TNiAzibCIi9wz9YnMO+9D6Dtjr3
o1AYguG/kAMONJ3obthy6YufSgsQaLtRJBMgr68fiBUom+IVC+BQLuFyL+HU95o9nIntYhQEogP/
uySp0AsnXHtlVHAt/ASoAoQdw4f19fxXuQBiEVSD87SVL4LKz8qNKZv32R64Tz/TWTAXLnoKEVs0
FRocnzQ5XT9kUzKDCZOyJkHQVscgJJJ87AfV6OqFmRJH7QXMysJHsd/l0vW3XqD1ULQcJhfvclIa
fZrNLNTpc5sDXiD7qUlDDs4GOP3qjL0iZsnmFbSlYGMWhOiJoqJ2xlXAXNqew6pQQ4l1lGC3S1+M
VKsdRVKBiqsPCvhI+WJBKOjE0OG0MpxbFlmzsW8vpRUVEQ51Ii+7Km5apglocROLPxUAtRWGMIEW
Cq5OdRfOfvzkZ3cXkzPCrZzNOVXAYl+OKnV2iIsgB12kbZCptK2+wEBTwwFCDQCaDeBtmbVFYzxs
/4u5IpwoSHTJw06A


--Boundary_(ID_tsvpsqwnGdyhs8W5ewXyJw)--