mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574

Browse source 
into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574
This commit is contained in:
msvensson@shellback.(none) 2006-03-07 20:03:01 +01:00
commit a3d9bb416d
3 changed files with 39 additions and 10 deletions
Show stats 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";

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

@ -1468,7 +1468,6 @@ sub ndbcluster_install () {
"--core"],
"", "", "", "") )
{
mtr_error("Error ndbcluster_install");
return 1;
}
@ -1777,9 +1776,19 @@ sub mysql_install_db () {
if ( ndbcluster_install() )
{
# failed to install, disable usage but flag that its no ok
$opt_with_ndbcluster= 0;
$flag_ndb_status_ok= 0;
if ( $opt_force)
{
# failed to install, disable usage and flag that its no ok
mtr_report("ndbcluster_install failed, continuing without cluster");
$opt_with_ndbcluster= 0;
$flag_ndb_status_ok= 0;
}
else
{
print "Aborting: Failed to install ndb cluster\n";
print "To continue, re-run with '--force'.\n";
mtr_exit(1);
}
}
if ( ndbcluster_install_slave() )
@ -1989,6 +1998,13 @@ sub run_testcase ($) {
return;
}
if ( $tinfo->{'ndb_test'} and ! $flag_ndb_status_ok )
{
mtr_report_test_name($tinfo);
mtr_report_test_failed($tinfo);
return;
}
# ----------------------------------------------------------------------
# If not using a running servers we may need to stop and restart.
# We restart in the case we have initiation scripts, server options