database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.1-new

Browse Source 
into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2006-03-07 20:45:44 +01:00
parent c0711619ad f0f8f114f5
commit f11bb1de2a
3 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/lib/mtr_cases.pl
View File

@ -252,19 +252,27 @@ sub collect_one_test_case($$$$$$$) {
$tinfo->{'slave_restart'}= 1;
}
if ( ( $::opt_with_ndbcluster or $::glob_use_running_ndbcluster ) and
( $::opt_with_ndbcluster_all or defined mtr_match_substring($tname,"ndb") ))
if ( $::opt_with_ndbcluster_all or defined mtr_match_substring($tname,"ndb") )
{
# This is an ndb test or all tests should be run with ndb cluster started
$tinfo->{'ndb_test'}= 1;
}
else
{
if ( $::opt_with_ndbcluster_only )
if ( $::opt_skip_ndbcluster )
{
# All ndb test's should be skipped
$tinfo->{'skip'}= 1;
return;
}
}
else
{
# This is not a ndb test
$tinfo->{'ndb_test'}= 0;
if ( $::opt_with_ndbcluster_only )
{
# Only the ndb test should be run, all other should be skipped
$tinfo->{'skip'}= 1;
return;
}
}
# FIXME what about embedded_server + ndbcluster, skip ?!

5
mysql-test/lib/mtr_report.pl
View File

@ -114,6 +114,11 @@ sub mtr_report_test_failed ($) {
{
print "[ fail ] timeout\n";
}
elsif ( $tinfo->{'ndb_test'} and !$::flag_ndb_status_ok)
{
print "[ fail ] ndbcluster start failure\n";
return;
}
else
{
print "[ fail ]\n";