bzr push into mysql-trunk-bugfixing branch (marc.alff:3263 to 3264)

[Marc Alff]

 3264 Marc Alff	2010-09-13 [merge]
      Merge mysql-5.5-bugfixing --> mysql-trunk-bugfixing

    modified:
      mysql-test/suite/perfschema/include/upgrade_check.inc
 3263 Tor Didriksen	2010-09-10 [merge]
      Header files should be self-contained

    modified:
      storage/perfschema/ha_perfschema.cc
=== modified file 'mysql-test/suite/perfschema/include/upgrade_check.inc'
--- a/mysql-test/suite/perfschema/include/upgrade_check.inc	2010-07-20 19:15:29 +0000
+++ b/mysql-test/suite/perfschema/include/upgrade_check.inc	2010-09-13 23:19:39 +0000
@@ -18,7 +18,7 @@
 #
 
 --error 1
---exec $MYSQL_UPGRADE --skip-verbose > $out_file 2> $err_file
+--exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file
 
 # Verify that mysql_upgrade complained about the performance_schema
 --cat_file $err_file


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