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

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

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


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2006-03-07 20:41:04 +01:00
parent e889f9efcc 329264140a
commit 9a879f89b4
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,19 +253,14 @@ sub collect_one_test_case($$$$$$$) {
}
# Cluster is needed by test case if testname contains ndb
if ( ( $::opt_with_ndbcluster or $::glob_use_running_ndbcluster ) and
defined mtr_match_substring($tname,"ndb") )
if ( defined mtr_match_substring($tname,"ndb") )
{
$tinfo->{'ndb_test'}= 1;
if ( $::opt_skip_ndbcluster )
{
$tinfo->{'ndb_test'}= 0;
$tinfo->{'skip'}= 1;
return;
}
else
{
$tinfo->{'ndb_test'}= 1;
}
}
else
{

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

@@ -1399,7 +1399,6 @@ sub ndbcluster_install () {
"--initial"],
"", "", "", "") )
{
mtr_error("Error ndbcluster_install");
return 1;
}
@@ -1606,9 +1605,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);
}
}
return 0;
@@ -1808,6 +1817,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