1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@neptunus.(none) 2006-10-06 13:41:59 +02:00
commit 2d145c3a95
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/mysql-test-run.pl
View File

@ -1177,7 +1177,9 @@ sub check_mysqld_features () {
if ( !$mysql_version_id ) if ( !$mysql_version_id )
{ {
# Look for version # 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"; #print "Major: $1 Minor: $2 Build: $3\n";
$mysql_version_id= $1*10000 + $2*100 + $3; $mysql_version_id= $1*10000 + $2*100 + $3;
@ -3490,6 +3492,11 @@ sub run_testcase_need_master_restart($)
$do_restart= 1; # Restart with cluster $do_restart= 1; # Restart with cluster
mtr_verbose("Restart because: Test need 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 elsif ( $master->[0]->{'running_master_is_special'} and
$master->[0]->{'running_master_is_special'}->{'timezone'} eq $master->[0]->{'running_master_is_special'}->{'timezone'} eq
$tinfo->{'timezone'} and $tinfo->{'timezone'} and