bzr commit into mysql-5.4-perfschema branch (marc.alff:2827)

[Marc Alff]

#At file:///home/malff/BZR-TREE/mysql-azalea-perfschema/ based on revid:marc.alff@stripped

 2827 Marc Alff	2009-07-10
      Fix spurious test failures for perfschema.myisam_file_io (tentative)
      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	2009-07-08 23:52:29 +0000
+++ b/mysql-test/suite/perfschema/r/myisam_file_io.result	2009-07-10 07:00:47 +0000
@@ -1,6 +1,8 @@
 update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
 update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
   where name like "wait/io/file/myisam/%";
+update performance_schema.SETUP_CONSUMERS
+set enabled='YES';
 truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
 drop table if exists test.no_index_tab;
 create table test.no_index_tab ( a varchar(255), b int ) engine=myisam;
@@ -23,4 +25,21 @@ wait/io/file/myisam/dfile	mi_dynrec.c:23
 wait/io/file/myisam/kfile	mi_open.c:1005	write	124	DATADIR/test/no_index_tab.MYI
 wait/io/file/myisam/dfile	mi_dynrec.c:236	write	20	./test/no_index_tab.MYD
 wait/io/file/myisam/kfile	mi_open.c:1005	write	124	DATADIR/test/no_index_tab.MYI
+show status like 'performance_schema_%';
+Variable_name	Value
+Performance_schema_cond_classes_lost	0
+Performance_schema_cond_instances_lost	0
+Performance_schema_file_classes_lost	0
+Performance_schema_file_handles_lost	0
+Performance_schema_file_instances_lost	0
+Performance_schema_locker_lost	0
+Performance_schema_mutex_classes_lost	0
+Performance_schema_mutex_instances_lost	0
+Performance_schema_rwlock_classes_lost	0
+Performance_schema_rwlock_instances_lost	0
+Performance_schema_table_handles_lost	0
+Performance_schema_table_instances_lost	0
+Performance_schema_thread_classes_lost	0
+Performance_schema_thread_instances_lost	0
+update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
 drop table test.no_index_tab;

=== modified file 'mysql-test/suite/perfschema/t/myisam_file_io.test'
--- a/mysql-test/suite/perfschema/t/myisam_file_io.test	2009-07-08 23:52:29 +0000
+++ b/mysql-test/suite/perfschema/t/myisam_file_io.test	2009-07-10 07:00:47 +0000
@@ -25,6 +25,9 @@ update performance_schema.SETUP_INSTRUME
 update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
   where name like "wait/io/file/myisam/%";
 
+update performance_schema.SETUP_CONSUMERS
+  set enabled='YES';
+
 truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
 
 # Code to test
@@ -45,5 +48,12 @@ select event_name, source, operation, nu
   from performance_schema.EVENTS_WAITS_HISTORY_LONG
   order by thread_id, event_id;
 
+# In case of failures, this will tell if file io are lost.
+show status like 'performance_schema_%';
+
+# Cleanup
+
+update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
+
 drop table test.no_index_tab;