bzr commit into mysql-5.1-mtr branch (bjorn.munch:2975) Bug#59063

[Bjorn Munch]

#At file:///home/bm136801/my/expwin-51/ based on revid:bjorn.munch@stripped

 2975 Bjorn Munch	2011-01-21
      Bug #59063 rpl_migration_crash_safe fails on Windows
      Race condition may occur: mtr sees the .expect file but it's empty
      Fix: wait and try again if file is empty
      Also added verbose printout of extra restart options

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-01-18 10:03:44 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-01-21 11:54:00 +0000
@@ -4095,6 +4095,8 @@ sub check_expected_crash_and_restart {
 
       for (my $waits = 0;  $waits < 50;  $waits++)
       {
+	# Race condition seen on Windows: try again until file not empty
+	next if -z $expect_file;
 	# If last line in expect file starts with "wait"
 	# sleep a little and try again, thus allowing the
 	# test script to control when the server should start
@@ -4471,6 +4473,8 @@ sub mysqld_start ($$) {
   my @all_opts= @$extra_opts;
   if (exists $mysqld->{'restart_opts'}) {
     push (@all_opts, @{$mysqld->{'restart_opts'}});
+    mtr_verbose(My::Options::toStr("mysqld_start restart",
+				   @{$mysqld->{'restart_opts'}}));
   }
   mysqld_arguments($args,$mysqld,\@all_opts);
 


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