Commit 247f85f7 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 814723e2 edadaf97

mysql-test/mysql-test-run.pl

+8 −1
Original line number Diff line number Diff line
@@ -1177,7 +1177,9 @@ sub check_mysqld_features () { 
    if ( !$mysql_version_id )

    {

      # Look for version

      if ( $line =~ /^$exe_mysqld\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ )

      my $exe_name= basename($exe_mysqld);

      mtr_verbose("exe_name: $exe_name");

      if ( $line =~ /^\S*$exe_name\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ )

      {

	#print "Major: $1 Minor: $2 Build: $3\n";

	$mysql_version_id= $1*10000 + $2*100 + $3;
@@ -3490,6 +3492,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