From: Bjorn Munch
Date: August 31 2010 9:29am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2928) Bug#56383
List-Archive: http://lists.mysql.com/commits/117189
X-Bug: 56383
Message-Id: <201008310929.o7V9TcPS014043@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1004284691=="

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

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

 2928 Bjorn Munch	2010-08-31
      Bug #56383 provide option to restart mysqld after each mtr test
      Added --force-restart

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-08-30 09:25:10 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-08-31 09:27:57 +0000
@@ -225,6 +225,7 @@ my $opt_repeat= 1;
 my $opt_retry= 3;
 my $opt_retry_failure= env_or_val(MTR_RETRY_FAILURE => 2);
 my $opt_reorder= 1;
+my $opt_force_restart= 0;
 
 my $opt_strace_client;
 
@@ -924,6 +925,7 @@ sub command_line_setup {
              'report-features'          => \$opt_report_features,
              'comment=s'                => \$opt_comment,
              'fast'                     => \$opt_fast,
+	     'force-restart'            => \$opt_force_restart,
              'reorder!'                 => \$opt_reorder,
              'enable-disabled'          => \&collect_option,
              'verbose+'                 => \$opt_verbose,
@@ -4512,6 +4514,11 @@ sub server_need_restart {
     return 1;
   }
 
+  if ( $opt_force_restart ) {
+    mtr_verbose_restart($server, "forced restart turned on");
+    return 1;
+  }
+
   if ( $tinfo->{template_path} ne $current_config_name)
   {
     mtr_verbose_restart($server, "using different config file");
@@ -5541,6 +5548,7 @@ Misc options
                         servers to exit before finishing the process
   fast                  Run as fast as possible, dont't wait for servers
                         to shutdown etc.
+  force-restart         Always restart servers between tests
   parallel=N            Run tests in N parallel threads (default=1)
                         Use parallel=auto for auto-setting of N
   repeat=N              Run each test N number of times


--===============1004284691==
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/restart-51/
# testament_sha1: 8f09d4673c28f83f82a89cddf607209819a9a676
# timestamp: 2010-08-31 11:29:38 +0200
# base_revision_id: bjorn.munch@stripped\
#   o2dkp5nz4scxx29n
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVbm0bwAAchfgGJwXOf//3IC
AAS////6UAQGu3UpcaHu8m88MhImASnvVR+p7UYJMjTJqZHqHpqaaDagkomIZMowRM0jJB6nqAAM
hoGgyBCAEkemjyo2JD9U0A0NpGg0AklE9AJo1AeU2p6J6gPUaYExAGTCSiQGg0NAAGg0BoAAARkR
6OtuQwi9X+mlgmPXNPgqj2ohJQSHYTDB2WuWN01DySwtnuYv5Ye/2nk5Y8noEQD14cyM0UgR6xsL
LF3xSNCKRt3Kvfj1frv5tPvzrOvySadGx67JOJyuYI3CzKlfht5nercWQSIAg5pdR4MqWpW2dqh+
gQ7yrqZ+IwBtjMVpSE9wihgSJBK+0L/PY5AxSnqh8RUDzzCGTw0sozBHgEAYGZQCc9ROUQAI1fnV
QQ5+aWA5Dft4o0yhY2vLBS/C7iw8IuLSRqiS5/TjkYxhkTxvaayw5cS9ARSdZsMxZuhCJBQzEs+z
+nBgLRPU9nDQZSbJQuGCbnvqo7lmLTK6+DbS8qqwtE7ByapHYNM5DTY2emDYKDEMoU067x494v6a
0eKZQppdTdwZC4e9x1AbHqFccqG8GvMSTxGdz9IY53W5ztCv1wzusHpXzca4HW1rMaQzzW/d5ihE
W3bUeXWcoO4PE0U4XG+N/PW9OJGzCqwjIe2JCgh+ONJMuIzfaThrjJQk1AzZXXUF1BwqAwqmFIua
1HkkUUOpQSRxMCU0f3St+I7BW7DQyBPTv/Pm/eSJ+kioUH78Q1YrNSMQNsrDxU6wkAuBy+WrUdk2
qndSSFzDPW4DZ8JWrlIYkWHr23j4mjHsAuF4RfampuoeLLyY7IDN2cBsnB20LCZADpwZUJHBIlO5
M5sVNTrzpG5dCCjU5cj+N4arO08i6ofGJ1CxjqKgF14spCtLJ9cu6nbPBw7lbMBVBBs711vXOl9z
3I3e01OlLuanWORQvWqxmlTBR5aoRlJSQpTzQCFrjFG8YVS6hEN1s1nJenueLDdtThtYjf2nqEAO
kDNRxwzgwGMoNwfJoOK0yaICkWlwdzAq6Q0NG8DjUBi2Si8eA+mRRDTKoVFjVm0E4JzQcmykhjrN
F5/BJUuKIRAJmBU6LBt5CUQPP49pIzx1j0HZdeNtxUkOVEA+kKJvehREFxpI2hvR0FgpkXmTKJeH
bCpKwUE7GVi5xvTuCRGEgicFa+uyiOu1OFh81NYzKAi61LS6BwSZRmCpHb0aYKBiFoScnUmCMhra
VUXJwXfApFDigBSxshxErSQk7ZhgxWBfpDHSNmrmKLjpitqYWAZMTsHBkLyJ4BLBiaNeoKixKu4N
cfUbOVJAJt57HpkwamR23TJwkE1oLsG1Ktq24VsebPVf22rxkkV4nntJqvRmE0ZWRsFsWLORXtGK
a+tlygcHbno4l6c526AkngP+LuSKcKEgrc2jeA==


--===============1004284691==--