bzr push into mysql-5.1-mtr branch (bjorn.munch:2927 to 2928) Bug#56383

[Bjorn Munch]

 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
 2927 Bjorn Munch	2010-08-30 [merge]
      merge 55413

    modified:
      client/mysqltest.cc
      mysql-test/r/mysqltest.result
      mysql-test/t/mysqltest.test
=== 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


Attachment: [text/bzr-bundle] bzr/[e-mail]