Commit 8ceaccb3 authored by unknown's avatar unknown
Browse files

Merge cleanup, with a change of verbose test status to Off. 


mysql-test/lib/mtr_process.pl:
  Resolved a previous bad merge of two different attempts at fixing the same problem.
mysql-test/mysql-test-run.pl:
  Default for verbose should be Off.
parent 30de4903

mysql-test/lib/mtr_process.pl

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ sub mtr_kill_process ($$$) { 
  my $timeout= shift; # Seconds to wait for process

  my $max_loop= $timeout*10; # Sleeping 0.1 between each kill attempt



  for (my $cur_attempt= 1; $cur_attempt <= $total_retries; ++$cur_attempt)

  for (my $cur_attempt= 1; $cur_attempt <= $max_loop; ++$cur_attempt)

  {

    mtr_debug("Sending $signal to $pid...");

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ our $opt_suite; 
our $opt_netware;



our $opt_script_debug= 0;  # Script debugging, enable with --script-debug

our $opt_verbose= 1;  # Verbose output, enable with --verbose

our $opt_verbose= 0;  # Verbose output, enable with --verbose



# Options FIXME not all....