database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

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

@ -1471,7 +1471,6 @@ sub ndbcluster_install () {
"--core"],
"", "", "", "") )
{
mtr_error("Error ndbcluster_install");
return 1;
}
@ -1567,7 +1566,6 @@ sub ndbcluster_install_slave () {
"--core"],
"", "", "", "") )
{
mtr_error("Error ndbcluster_install_slave");
return 1;
}
@ -1780,16 +1778,37 @@ 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() )
{
# failed to install, disable usage but flag that its no ok
$opt_with_ndbcluster_slave= 0;
$flag_ndb_slave_status_ok= 0;
if ( $opt_force)
{
# failed to install, disable usage and flag that its no ok
mtr_report("ndbcluster_install_slave failed, " .
"continuing without slave cluster");
$opt_with_ndbcluster_slave= 0;
$flag_ndb_slave_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;
@ -1992,6 +2011,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