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

[Marc Alff]

 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


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