List:Commits« Previous MessageNext Message »
From:Marc Alff Date:September 13 2010 11:44pm
Subject:bzr push into mysql-next-mr-bugfixing branch (marc.alff:3285 to 3286)
View as plain text  
 3286 Marc Alff	2010-09-13 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

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

=== 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/marc.alff@oracle.com-20100913234137-5jn9bhutv7iywxha.bundle
Thread
bzr push into mysql-next-mr-bugfixing branch (marc.alff:3285 to 3286) Marc Alff14 Sep