List:Commits« Previous MessageNext Message »
From:Matthias Leich Date:May 9 2011 5:54pm
Subject:bzr commit into mysql-5.5 branch (matthias.leich:3500)
View as plain text  
#At file:///work2/repo/mysql-5.5/ based on revid:alexander.nozdrin@stripped

 3500 Matthias Leich	2011-05-09
      Fix for Bug 12431153 - THE TEST PERFSCHEMA.PFS_UPGRADE CAN AFFECT SUCCEEDING TESTS
      
      Take care that the disconnect for the session caused by
      MYSQL_UPGRADE is finished.

    modified:
      mysql-test/suite/perfschema/include/upgrade_check.inc
=== modified file 'mysql-test/suite/perfschema/include/upgrade_check.inc'
--- a/mysql-test/suite/perfschema/include/upgrade_check.inc	2010-09-13 23:19:39 +0000
+++ b/mysql-test/suite/perfschema/include/upgrade_check.inc	2011-05-09 17:54:26 +0000
@@ -17,8 +17,10 @@
 # $out_file and $err_file must be set within pfs_upgrade.test.
 #
 
+--source include/count_sessions.inc
 --error 1
 --exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file
+--source include/wait_until_count_sessions.inc
 
 # Verify that mysql_upgrade complained about the performance_schema
 --cat_file $err_file


Attachment: [text/bzr-bundle] bzr/matthias.leich@oracle.com-20110509175426-b93tw1ibh16ka8z7.bundle
Thread
bzr commit into mysql-5.5 branch (matthias.leich:3500) Matthias Leich9 May