bzr push into mysql-5.5-bugfixing branch (marc.alff:3206 to 3207) Bug#53102

[Marc Alff]

 3207 Marc Alff	2010-09-13
      Bug#53102 perfschema.pfs_upgrade fails when executed direct after mysql_upgrade
      
      Implemented post review comments.
      
      Added --force to the mysql_upgrade command in the test scripts,
      so that the test output does not depends on whether other tests involving an
      upgrade have been executed or not in the same test suite execution.

    modified:
      mysql-test/suite/perfschema/include/upgrade_check.inc
 3206 Tor Didriksen	2010-09-10
      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]