mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
This commit is contained in:
msvensson@neptunus.(none) 2006-10-05 13:09:51 +02:00
commit c174439942
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
mysql-test/mysql-test-run.pl
View file

@ -2619,21 +2619,24 @@ sub run_testcase_check_skip_test($)
return 1; return 1;
} }
# If test needs cluster, check that master installed ok if ($tinfo->{'ndb_test'})
if ( $tinfo->{'ndb_test'} and !$clusters->[0]->{'installed_ok'} )
{ {
mtr_report_test_name($tinfo); foreach my $cluster (@{$clusters})
mtr_report_test_failed($tinfo); {
return 1; last if ($opt_skip_ndbcluster_slave and
} $cluster->{'name'} eq 'Slave');
# If test needs slave cluster, check that it installed ok # If test needs this cluster, check it was installed ok
if ( $tinfo->{'ndb_test'} and $tinfo->{'slave_num'} and if ( !$cluster->{'installed_ok'} )
!$clusters->[1]->{'installed_ok'} ) {
{ mtr_tofile($path_timefile,
mtr_report_test_name($tinfo); "Test marked as failed because $cluster->{'name'} " .
mtr_report_test_failed($tinfo); "was not installed ok!");
return 1; mtr_report_test_name($tinfo);
mtr_report_test_failed($tinfo);
return 1;
}
}
} }
return 0; return 0;