Fix for 3910

0a69e028 · joreland@mysql.com · e22b3f24 · 0a69e028
Commit 0a69e028 authored Jun 03, 2004 by joreland@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

ndb/src/kernel/Main.cpp ndb/src/kernel/Main.cpp +8 -0

No files found.
--- a/ndb/src/kernel/Main.cpp
+++ b/ndb/src/kernel/Main.cpp
@@ -91,6 +91,7 @@ NDB_MAIN(ndb_kernel){
     * Parent
     */
    catchsigs(true);
+
    int status = 0;
    while(waitpid(child, &status, 0) != child);
    if(WIFEXITED(status)){
@@ -112,6 +113,13 @@ NDB_MAIN(ndb_kernel){
 	globalData.theRestartFlag = perform_start;
 	break;
      default:
+	if(theConfig->stopOnError()){
+	  /**
+	   * Error shutdown && stopOnError()
+	   */
+	  exit(0);
+	}
+	// Fall-through
      case NRT_DoStart_Restart:
 	theConfig->setInitialStart(false);
 	globalData.theRestartFlag = perform_start;