bzr push into mysql-trunk branch (marc.alff:3655 to 3656)

[Marc Alff]

 3656 Marc Alff	2011-02-16
      Fixed the table aggregation tests to be more robust,
      to avoid spurious failures.

    modified:
      mysql-test/suite/perfschema/include/table_aggregate_setup.inc
 3655 Tor Didriksen	2011-02-16 [merge]
      merge 5.5 => trunk

    modified:
      extra/comp_err.c
=== modified file 'mysql-test/suite/perfschema/include/table_aggregate_setup.inc'
--- a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc	2010-12-09 16:39:45 +0000
+++ b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc	2011-02-16 14:38:29 +0000
@@ -132,6 +132,10 @@ update performance_schema.setup_instrume
 # Enable all consumers (by default)
 update performance_schema.setup_consumers set enabled='YES';
 
+# Start from a known clean state, to avoid noise from previous tests
+flush tables;
+flush status;
+
 create table test.t1(a int, b int, c int, d int default 0,
   primary key(a),
   index index_b(b),

No bundle (reason: useless for push emails).