Commit e94e55c7 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/deleted/.del-abi_check.ic:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents 6cd30595 0d087e05

mysql-test/mysql-test-run.pl

+3 −2
Original line number Diff line number Diff line
@@ -1315,7 +1315,8 @@ sub executable_setup_im () { 
  $exe_im=

    mtr_exe_maybe_exists(

      "$glob_basedir/server-tools/instance-manager/mysqlmanager",

      "$glob_basedir/libexec/mysqlmanager");

      "$glob_basedir/libexec/mysqlmanager",

      "$glob_basedir/bin/mysqlmanager");



  return ($exe_im eq "");

}
@@ -3062,7 +3063,7 @@ sub run_testcase ($) { 
  # -------------------------------------------------------



  $ENV{'TZ'}= $tinfo->{'timezone'};

  mtr_verbose("Starting server with timezone: $tinfo->{'timezone'}");

  mtr_verbose("Setting timezone: $tinfo->{'timezone'}");



  my $master_restart= run_testcase_need_master_restart($tinfo);

  my $slave_restart= run_testcase_need_slave_restart($tinfo);