From: Bjorn Munch
Date: January 21 2011 11:56am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2975) Bug#59063
List-Archive: http://lists.mysql.com/commits/129324
X-Bug: 59063
Message-Id: <201101211156.p0LBuhL5015718@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0958037931=="

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

#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);
 


--===============0958037931==
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/expwin-51/
# testament_sha1: 9bff5f7cc2a629c14ee4b716687e5a563bb1899b
# timestamp: 2011-01-21 12:56:43 +0100
# base_revision_id: bjorn.munch@stripped\
#   fw4rz2qzcny5purh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe8NV7UAAbbfgEAwXOf//3MC
mIC////6UARaru5STne3bbud297eEoiJoxqYI01PSehqNHppAZANANAyRNNGEBoiNMIeoAAAAAEo
mgQTQ001M1PSepGjMoaaeoGamQxA2pEMkxT9UPSaM1A9QekGjQAADQSSKeVPCbUepMCehGho0AAA
ACsqMlOjz0bjnO/XeLsnzFDroN45kBYYMsxmw0o613H0dv35t1Kiqe3kfL2EXXO+MaNXK3zkxaFK
6iORFqGTK1nK3lKFHhNm4SfGFMXfuMfB7FsYsSppg53Q+Wbp1ryr+YyheqXZjiYIpqH+3+uyynyI
TCUzUqjMbayxpXiqJISVETsSBmofVnnDigh0wP5lSyE4FcmIqDkmT5796y0Y0ZQBUXh6okYNWCNc
CyKBLxDJwItB2OBWCEWg8SdhU0/ZnsHJ9z+U1zKxLS41X8YZKkkUrgo6qg0iLdHZAuJSOII5E1KS
LdUWH1FjgqIqcE6Nu3gpeYLXQJDSmAotwqZJCykf34LEEpFV6gaTWXDEFxKZAvi8wEdEmgugzlFx
m3Q9T/IwmsulNdMyogiiWBOMoQI9uq2n1NO6gwwOpGbCnMWLQbNmWmeh87rkWaQ3VWLqLLEqwCYv
nWxAYxNusXoFNRomsp3HRW6h8NAMII+coqN8xrWGPE8wUt3QmQNQL9XJsddjNtL4EItozirDmWFb
h7kWKvKQjJZ4b9vE3vyxzM4Xs7/h7uCIVVSVUU8bBmf9Hs3FSzOqyQ3O21DjRiKwXptyH6+ubD7L
4UQgkxuYK8FvgdfbQ7Bh2xoPA9nRVvv6Fnv5Q1ForODohuPqLiu1DNIWFmwjNp36CA1vkA7OgnLq
fYwKR1grbV/WK5libDdMnHk0IlEnGcQ0Zthk2O91KXAUhTYLI82XZjaGJjAnmUhxZHQrxEc9kNzA
6NhrY2MIthOaZadc8ldsKtylOGuV9WerDSi85vRUgqpeIqIO7HCQtKOFDbX1fq/VJIToyW4laJHr
9uRIf2Kc/W6xSk6lsqSz1bx/DArUYcpU09F8IFsC/emmrjMwmS6XMqJQwwMOzeH8SybuTI9qiKUV
VI7QcyYm/ILWlWcuN3xRDjtwMQlamVIdwlgWMEIEQmiC3LWvbdf1P86CvAFvGV1N0VbueSoooVpH
46AW/p6WzlstexOapnJniLicbBldfJkhohcGOwd7PqmUQKyllEZMrVy6dFF5oJEWcODpZPOdxAhm
+0igKlIFqetRim/YWTJkdYqo8XGGexJ8ebFig4rClaRO8xRO7yTRQWJKSNK0RL8eyRNC09NW9ipI
9F9aImZmj9SoJSwmDkgluPTe46SiMXWY4VFhOTEtqwGpWmzh825NYpIoYrBh46D6s+nMNBZKQoat
jQ2chV1t6CQRHQpdERDM4xmiBOlwamk+ZVqNUxU8zIyogm04YUmqwFXHbqL8b61IhbaiSfTXSSfO
6UZRgMymsrElEwaPSQsZXQrlMNKcQu4bfb71/4u5IpwoSHeGq9qA


--===============0958037931==--