database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
- 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.
This commit is contained in:
unknown
2006-03-07 20:35:59 +01:00
parent 4070ab9953
commit f0f8f114f5
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1563,7 +1563,6 @@ sub ndbcluster_install_slave () {
"--core"], "--core"],
"", "", "", "") ) "", "", "", "") )
{ {
mtr_error("Error ndbcluster_install_slave");
return 1; return 1;
} }
@ -1793,10 +1792,21 @@ sub mysql_install_db () {
if ( ndbcluster_install_slave() ) 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; $opt_with_ndbcluster_slave= 0;
$flag_ndb_slave_status_ok= 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; return 0;
} }