List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:January 18 2011 11:30am
Subject:bzr commit into mysql-5.1-mtr branch (bjorn.munch:2973) Bug#59063
View as plain text  
#At file:///home/bm136801/my/mtr-51/ based on revid:bjorn.munch@stripped

 2973 Bjorn Munch	2011-01-18
      Bug #59063 rpl_migration_crash_safe fails on Windows
      Undoing the patch, it complicates the code but is not the solution
      
      I do not beleive newline mismatch could be the cause of this failure
      First, I cannot see how this could be a problem, mtr ignores the newline
        when reading the expect file, and the file is written and read on Windows.
      Second, if this really was the problem it should have been deterministic:
        either the newline is correctly interepreted or it is not.

    modified:
      mysql-test/include/rpl_start_server.inc
      mysql-test/include/rpl_stop_server.inc
=== modified file 'mysql-test/include/rpl_start_server.inc'
--- a/mysql-test/include/rpl_start_server.inc	2011-01-14 10:33:12 +0000
+++ b/mysql-test/include/rpl_start_server.inc	2011-01-18 11:25:07 +0000
@@ -45,15 +45,7 @@ if ($rpl_server_parameters)
 --source include/rpl_connection.inc
 
 # Write file to make mysql-test-run.pl start up the server again
---let WRITE_TO_FILE= $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
---let WRITE_TO_VAR= $_rpl_start_server_command
-perl;
-my $file= $ENV{'WRITE_TO_FILE'};
-my $var= $ENV{'WRITE_TO_VAR'};
-open WRITE_FILE, ">> $file" or die "Error opening $file: $!";
-print WRITE_FILE $var, "\n" or die "Error appending to $file: $!";
-close WRITE_FILE or die "Error closing $file: $!";
-EOF
+--exec echo "$_rpl_start_server_command" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
 
 --source include/rpl_reconnect.inc
 

=== modified file 'mysql-test/include/rpl_stop_server.inc'
--- a/mysql-test/include/rpl_stop_server.inc	2011-01-14 10:33:12 +0000
+++ b/mysql-test/include/rpl_stop_server.inc	2011-01-18 11:25:07 +0000
@@ -44,9 +44,7 @@ if ($rpl_debug)
 
 # Write file to make mysql-test-run.pl expect the "crash", but don't start
 # it until it's told to
---append_file $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
-wait
-EOF
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
 
 # Send shutdown to the connected server and give
 # it 10 seconds to die before zapping it


Attachment: [text/bzr-bundle] bzr/bjorn.munch@oracle.com-20110118112507-79bvq344rw3nwqbp.bundle
Thread
bzr commit into mysql-5.1-mtr branch (bjorn.munch:2973) Bug#59063Bjorn Munch18 Jan