Commit ca9faacf authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 64ad6bfb 81d42333

mysql-test/mysql-test-run.pl

+5 −0
Original line number Diff line number Diff line
@@ -3490,6 +3490,11 @@ sub run_testcase_need_master_restart($) 
    $do_restart= 1;           # Restart with cluster

    mtr_verbose("Restart because: Test need cluster");

  }

  elsif( $tinfo->{'component_id'} eq 'im' )

  {

    $do_restart= 1;

    mtr_verbose("Restart because: Always restart for im tests");

  }

  elsif ( $master->[0]->{'running_master_is_special'} and

	  $master->[0]->{'running_master_is_special'}->{'timezone'} eq

	  $tinfo->{'timezone'} and