Commit 0a69e028 authored by joreland@mysql.com's avatar joreland@mysql.com

Fix for 3910

parent e22b3f24
...@@ -91,6 +91,7 @@ NDB_MAIN(ndb_kernel){ ...@@ -91,6 +91,7 @@ NDB_MAIN(ndb_kernel){
* Parent * Parent
*/ */
catchsigs(true); catchsigs(true);
int status = 0; int status = 0;
while(waitpid(child, &status, 0) != child); while(waitpid(child, &status, 0) != child);
if(WIFEXITED(status)){ if(WIFEXITED(status)){
...@@ -112,6 +113,13 @@ NDB_MAIN(ndb_kernel){ ...@@ -112,6 +113,13 @@ NDB_MAIN(ndb_kernel){
globalData.theRestartFlag = perform_start; globalData.theRestartFlag = perform_start;
break; break;
default: default:
if(theConfig->stopOnError()){
/**
* Error shutdown && stopOnError()
*/
exit(0);
}
// Fall-through
case NRT_DoStart_Restart: case NRT_DoStart_Restart:
theConfig->setInitialStart(false); theConfig->setInitialStart(false);
globalData.theRestartFlag = perform_start; globalData.theRestartFlag = perform_start;
......
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