From: Bjorn Munch
Date: January 18 2011 11:30am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2973) Bug#59063
List-Archive: http://lists.mysql.com/commits/129068
X-Bug: 59063
Message-Id: <201101181130.p0IBUF6D019298@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0174114902=="

--===============0174114902==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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


--===============0174114902==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/mtr-51/
# testament_sha1: fb9c220eedea77ccf27d18c3971f286047b05870
# timestamp: 2011-01-18 12:30:15 +0100
# base_revision_id: bjorn.munch@stripped\
#   6b8wr9icafxtxqqe
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWddSBaUAAjHfgEAQXGf/93cm
P6C////wUAWPcga6Heme7aUddUEJRCj01TzSmmwU9PVNNNBoAADQNBoGqNNRkxHkGiBoAGExGgya
AAJQgUyT0NJkZDRoyDGo9QaGjTTQ0BJJGTVMm9T0o0DNQZNHqANBkDQBoJJAgaBGTSngp+po0TKA
2k000DICKacdWTUKe3uPsW6Xg1CBVgdTbqYCMcSflnwtYzEpSfLAuzPicxmGDP5o3Qlezi+9xrjE
e5vnM6TW5nfoPoXQo2AsShSYpEVkpr/Z3Wfpz3xFhDa51oZMM4yzEoDzW+3GCdlkk4FfxyaZzR3f
JbphfxynwOvl4jlMMZ6ggwhwbO8dytyu5W9RwXg9C3Yq8NQHHoVnCcyzduhAq3UiUwKhLEaqBmH5
kUim93d1MQgyEyEex5kPd2AbAqGkEU7B30GWdk0osz4UBw+g9CiHnE9fqT86FQJMuicwDnIUI4mB
tDwJBQBXN759t7A8kt87g7tmTx9CRcG/lhTEmMWDGW1wd5pds3vkpDkBqDgr0cA5sxr2RA0gVYEL
ihD7AiwxUVxfC8sSo4gJ5pyYlTjCcFGrfMEx5KQEMTdUMbWI0SBoKyosxwwIgcifPEC0u7UiuGAb
gSOo4oCSnDKDtAhAgg2CwsvZZVaWM2YFyJqp4QD7KjJYEzXpAHk0EsTNbDC9qLcjHiHG0DZILgaD
ZBVMAtGr2Gdw1MbIVZw4EOJVSSeoTrDJ88rK6ZGDX123l4E6bjksrqpmdrwvriRuaM3BBwNJoKlE
pFDsfcvHMr8Tc57mZcPeUnn0PAF/JSTZhRfXGZh+whOuo+DzH7DSe59FBNsIjfZYNpQZeIuGIGRb
SaNzYaHiww0BgZK70vFltoyOG1cxcvCUqBSRazIsEHFemN0pjcMkxP3UIkgs2JI+LOa7XvExbrKk
vOrNA8pKhS0PM5uM6VHaijbdZqAdP4AdaLI5itO7Mk7UNQqZpYepVqMhSsODvyHCUCr5iXpi+lk/
2jw8k1LUhxIGK559uh5FZjIrDbSGfxh1HoOGlCbdBuXkbNCMzjYJPlJtYO43NpvSlbi+ZitIbrlF
8RgCreIEqaWxW85ykiDY3VEUTkxI1GA7NFG6zDsbOjumDQt5m+7ZdT0bt9HFUi9+XE2pkyHSHilk
e1FcV3jaWoDIZZNFbsKhjTQaCt6D80IlZItOZqdl6MTPTv4HOjesC9eZUdRjQ0cWFS7QGInU4kRV
mS6g0AZCZKvicEE/tcEiUrkQNtrvYur9qjmQXDDMi2WgVGAdmEmNKH8RTFPnoh+SufGwFXW/yGGZ
54orzgtu/SLqDHadj8WBcTRDFAUIocHkI7l6HcFAkxQMSqKNVfurdRWWWD+H1DYb5XeY0hLKRi1p
acJmplLSqsuKqk+LnGoLYHvOpC2xxgisCMMhMPEt2VBGGR7IMfzIOgjJYWFb8SmQrUmTMGwcvUDL
uJXnBqn6QQH3lURhPfLRNH/hKhErq/EKPE9PDBSSJGNFgw0yCvWMMDUrMpRwEQt4bqSqR2A7wOit
D4Bctt3Kb2SKUygkE9myc1fuJRjXXlqW2QW/JxFMyFEvvdVnM2Rns5qyn23hY9kHvAcrYo8WiSdC
6zf2KM6DDKhBsPUJ9oqJKhGA8tPawxCO09wXexlSEmVYGZbnF+Lnszbd75OHlYcgciA6zAk6GhgD
MgrZPrqrtJxt3kgJrUalgsL0bbjzoLl4UnygCsou1ch04FCtQbUUAWPAtDTIkqAPgn0ED3DLRMjF
XljDEwJzWgq8D/F3JFOFCQ11IFpQ


--===============0174114902==--