Commit 2bced1df authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
parents 780fc6b6 58c571a4

mysql-test/lib/mtr_process.pl

+2 −3
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ sub mtr_wait_blocking($) { 
  }

}



# Start "mysqladmin shutdown" for a specific mysqld

# Start "mysqladmin <command>" for a specific mysqld

sub mtr_mysqladmin_start($$$) {

  my $srv= shift;

  my $command= shift;
@@ -738,9 +738,8 @@ sub mtr_mysqladmin_start($$$) { 
  # Shutdown time must be high as slave may be in reconnect

  mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo");

  mtr_add_arg($args, "$command");

  my $path_mysqladmin_log= "$::opt_vardir/log/mysqladmin.log";

  my $pid= mtr_spawn($::exe_mysqladmin, $args,

		     "", $path_mysqladmin_log, $path_mysqladmin_log, "",

		     "", "", "", "",

		     { append_log_file => 1 });

  mtr_verbose("mtr_mysqladmin_start, pid: $pid");

  return $pid;

mysql-test/lib/mtr_report.pl

+5 −1
Original line number Diff line number Diff line
@@ -94,10 +94,14 @@ sub mtr_report_test_skipped ($) { 
  {

    print "[ disabled ]  $tinfo->{'comment'}\n";

  }

  else

  elsif ( $tinfo->{'comment'} )

  {

    print "[ skipped ]   $tinfo->{'comment'}\n";

  }

  else

  {

    print "[ skipped ]\n";

  }

}



sub mtr_report_tests_not_skipped_though_disabled ($) {

mysql-test/mysql-test-run.pl

+0 −14
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ use IO::Socket::INET; 
use Data::Dumper;

use strict;

use warnings;

use diagnostics;



select(STDOUT);

$| = 1; # Automatically flush STDOUT
@@ -1976,19 +1975,6 @@ sub kill_running_servers () { 
    # This is different from terminating processes we have

    # started from this run of the script, this is terminating

    # leftovers from previous runs.



    if ( ! -d $opt_vardir )

    {

      if ( -l $opt_vardir and ! -d readlink($opt_vardir) )

      {

	mtr_report("Removing $opt_vardir symlink without destination");

	unlink($opt_vardir);

      }

      # The "var" dir does not exist already

      # the processes that mtr_kill_leftovers start will write

      # their log files to var/log so it should be created

      mkpath("$opt_vardir/log");

    }

    mtr_kill_leftovers();

   }

}