Commit f0f8f114 authored by unknown's avatar unknown

Bug#17574 Detect cluster start failure and "fail" ndb_* tests

 - Update for 5.1


mysql-test/mysql-test-run.pl:
  Remove mtr_error call from ndbcluster_install_slave
  Check if ndbcluster_install_slave failed after it's been called. continu with disabled slave cluster if  --force is used.
parent 4070ab99
......@@ -1563,7 +1563,6 @@ sub ndbcluster_install_slave () {
"--core"],
"", "", "", "") )
{
mtr_error("Error ndbcluster_install_slave");
return 1;
}
......@@ -1793,10 +1792,21 @@ sub mysql_install_db () {
if ( ndbcluster_install_slave() )
{
# failed to install, disable usage but flag that its no ok
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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment