Commit 60f1320e authored by unknown's avatar unknown
Browse files

Move initializations of environment variables that are constant during the... 

Move initializations of environment variables that are constant during the whole testrun to 'environment_setup'
Split out functions that detects if we need master or slave restarts


mysql-test/lib/mtr_process.pl:
  Fix spelling error
mysql-test/mysql-test-run.pl:
  Move initializations of environment variables that are constant during the whole testrun to 'environment_setup'
  Split out functions 'run_testcase_need_master_restart' and 'run_testcase_need_slave_restart'
parent 551f9ded

mysql-test/lib/mtr_process.pl

+4 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ sub mtr_check_stop_servers ($) { 
      }

      else

      {

	mtr_verbose("All ports where free, continuing");

	mtr_verbose("All ports were free, continuing");

      }

    }

  }
@@ -896,6 +896,7 @@ sub check_expected_crash_and_restart($) 


sub mtr_record_dead_children () {



  my $process_died= 0;

  my $ret_pid;



  # Wait without blockinng to see if any processes had died
@@ -904,7 +905,9 @@ sub mtr_record_dead_children () { 
  {

    mtr_warning("mtr_record_dead_children: $ret_pid");

    mark_process_dead($ret_pid);

    $process_died= 1;

  }

  return $process_died;

}



sub start_reap_all {

mysql-test/mysql-test-run.pl

+307 −224

File changed.

Preview size limit exceeded, changes collapsed.