From: Bjorn Munch
Date: September 1 2010 1:52pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3086)
List-Archive: http://lists.mysql.com/commits/117340
Message-Id: <201009011352.o81DqvVt010323@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0965090213=="

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

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

 3086 Bjorn Munch	2010-09-01 [merge]
      upmerge 56383

    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 13:19:46 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-09-01 13:52:31 +0000
@@ -244,6 +244,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;
 
@@ -944,6 +945,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,
@@ -4577,6 +4579,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");
@@ -5605,6 +5612,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


--===============0965090213==
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-55/
# testament_sha1: a9c6a521f507514eb04bf6eeaeee1b8d2405bd70
# timestamp: 2010-09-01 15:52:57 +0200
# source_branch: file:///home/bm136801/my/mysql-5.5/
# base_revision_id: bjorn.munch@stripped\
#   sekhyt8voytrtbtf
# 
# Begin bundle
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
yBxeg7A9YrBOIxPfivaotOQ/i7kinChIJ5LpVYA=


--===============0965090213==--