bzr push into mysql-trunk branch (marc.alff:3343)

[Marc Alff]

 3343 Marc Alff	2011-08-03 [merge]
      local merge

=== modified file 'mysql-test/suite/perfschema/include/table_io_setup_helper.inc'
--- a/mysql-test/suite/perfschema/include/table_io_setup_helper.inc	2010-11-09 05:02:46 +0000
+++ b/mysql-test/suite/perfschema/include/table_io_setup_helper.inc	2011-08-03 15:03:20 +0000
@@ -64,6 +64,9 @@ truncate table performance_schema.events
 # Reset lost counters to a known state
 flush status;
 
+# Make sure there is room to instrument tables from this test.
+flush tables;
+
 # By default, dump table io only for test.
 # A test can overide this
 let $schema_to_dump="test";

=== modified file 'mysql-test/suite/perfschema/r/csv_table_io.result'
--- a/mysql-test/suite/perfschema/r/csv_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/csv_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 drop table if exists test.no_index_tab;
 update performance_schema.setup_consumers set enabled='YES';
 insert into marker set a = 1;

=== modified file 'mysql-test/suite/perfschema/r/indexed_table_io.result'
--- a/mysql-test/suite/perfschema/r/indexed_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/indexed_table_io.result	2011-08-03 15:03:20 +0000
@@ -8,6 +8,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 create table test.no_index_tab
 ( a int, b char(30) default 'Default') engine = MyISAM;
 create table test.index_tab

=== modified file 'mysql-test/suite/perfschema/r/innodb_table_io.result'
--- a/mysql-test/suite/perfschema/r/innodb_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/innodb_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 drop table if exists test.no_index_tab;
 update performance_schema.setup_consumers set enabled='YES';
 insert into marker set a = 1;

=== modified file 'mysql-test/suite/perfschema/r/memory_table_io.result'
--- a/mysql-test/suite/perfschema/r/memory_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/memory_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 drop table if exists test.no_index_tab;
 update performance_schema.setup_consumers set enabled='YES';
 insert into marker set a = 1;

=== modified file 'mysql-test/suite/perfschema/r/merge_table_io.result'
--- a/mysql-test/suite/perfschema/r/merge_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/merge_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 drop table if exists test.no_index_tab;
 drop table if exists test.no_index_tab_1;
 drop table if exists test.no_index_tab_2;

=== modified file 'mysql-test/suite/perfschema/r/multi_table_io.result'
--- a/mysql-test/suite/perfschema/r/multi_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/multi_table_io.result	2011-08-03 15:03:20 +0000
@@ -24,6 +24,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 update performance_schema.setup_consumers set enabled = 'YES';
 insert into test1.t2 select * from test.t1;
 insert into marker set a = 1;

=== modified file 'mysql-test/suite/perfschema/r/myisam_table_io.result'
--- a/mysql-test/suite/perfschema/r/myisam_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/myisam_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 drop table if exists test.no_index_tab;
 update performance_schema.setup_consumers set enabled='YES';
 insert into marker set a = 1;

=== modified file 'mysql-test/suite/perfschema/r/part_table_io.result'
--- a/mysql-test/suite/perfschema/r/part_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/part_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 drop table if exists test.no_index_tab;
 update performance_schema.setup_consumers set enabled='YES';
 insert into marker set a = 1;

=== modified file 'mysql-test/suite/perfschema/r/privilege_table_io.result'
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result	2011-07-21 16:27:14 +0000
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 # We are forced to suppress here the server response.
 optimize table mysql.db;
 update performance_schema.setup_consumers set enabled='YES';

=== modified file 'mysql-test/suite/perfschema/r/rollback_table_io.result'
--- a/mysql-test/suite/perfschema/r/rollback_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/rollback_table_io.result	2011-08-03 15:03:20 +0000
@@ -15,6 +15,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 update performance_schema.setup_consumers set enabled = 'YES';
 set autocommit = off;
 delete from test.t1 where col1 = 1;

=== modified file 'mysql-test/suite/perfschema/r/temp_table_io.result'
--- a/mysql-test/suite/perfschema/r/temp_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/temp_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 drop temporary table if exists test.no_index_tab;
 update performance_schema.setup_consumers set enabled = 'YES';
 insert into marker set a = 1;

=== modified file 'mysql-test/suite/perfschema/r/trigger_table_io.result'
--- a/mysql-test/suite/perfschema/r/trigger_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/trigger_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 drop table if exists test.t1;
 drop table if exists test.t2;
 create table test.t1 (a int, v int) engine = MyISAM;

=== modified file 'mysql-test/suite/perfschema/r/view_table_io.result'
--- a/mysql-test/suite/perfschema/r/view_table_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/view_table_io.result	2011-08-03 15:03:20 +0000
@@ -6,6 +6,7 @@ update performance_schema.setup_instrume
   where name like "wait/io/table/%";
 truncate table performance_schema.events_waits_history_long;
 flush status;
+flush tables;
 drop view if exists test.v1;
 drop table if exists test.no_index_tab;
 update performance_schema.setup_consumers set enabled='YES';

No bundle (reason: useless for push emails).