bzr push into mysql-5.6 branch (marc.alff:4019 to 4020) Bug#14281066

[Marc Alff]

 4020 Marc Alff	2012-07-13
      Bug#14281066 - PERFSCHEMA.PRIVILEGE_TABLE_IO FAILS ON PB2 SPORADICALLY
      
      Before this fix, the test privilege_table_io could fail,
      printing table io events for spurious deleted records in mysql.* tables.
      
      This fix improves the test robustness, by extending the fix already done
      for table mysql.db to every mysql.* tables involved.

    modified:
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/t/privilege_table_io.test
 4019 Annamalai Gurusami	2012-07-13 [merge]
      Null merge from mysql-5.5 to mysql-5.6. 

=== modified file 'mysql-test/suite/perfschema/r/privilege_table_io.result'
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result	2012-05-31 15:15:33 +0000
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result	2012-07-13 08:39:12 +0000
@@ -8,7 +8,13 @@ truncate table performance_schema.events
 flush status;
 flush tables;
 # We are forced to suppress here the server response.
+optimize table mysql.host;
+optimize table mysql.user;
 optimize table mysql.db;
+optimize table mysql.proxies_priv;
+optimize table mysql.tables_priv;
+optimize table mysql.procs_priv;
+optimize table mysql.servers;
 update performance_schema.setup_consumers set enabled='YES';
 update performance_schema.setup_objects set enabled='YES'
   where object_type='TABLE' and object_schema= 'mysql';

=== modified file 'mysql-test/suite/perfschema/t/privilege_table_io.test'
--- a/mysql-test/suite/perfschema/t/privilege_table_io.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/privilege_table_io.test	2012-07-13 08:39:12 +0000
@@ -4,7 +4,7 @@
 --source include/have_perfschema.inc
 --source ../include/table_io_setup_helper.inc
 
-# Remove "deleted" records from mysql.db that may come from previous tests,
+# Remove "deleted" records from mysql.* that may come from previous tests,
 # to avoid displaying spurious fetch.
 # There are two possible server reactions which are both ok.
 # Table  Op      Msg_type        Msg_text
@@ -14,7 +14,13 @@
 # Therefore we suppress the query_log here.
 --echo # We are forced to suppress here the server response.
 --disable_result_log
+optimize table mysql.host;
+optimize table mysql.user;
 optimize table mysql.db;
+optimize table mysql.proxies_priv;
+optimize table mysql.tables_priv;
+optimize table mysql.procs_priv;
+optimize table mysql.servers;
 --enable_result_log
 
 # Start recording events

No bundle (reason: useless for push emails).