merge

0c559223 · jonas@perch.ndb.mysql.com · 3e312142 · 0c559223 · 0c559223
Commit 0c559223 authored Feb 10, 2006 by jonas@perch.ndb.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ndb/src/kernel/blocks/dbdict/Dbdict.cpp ndb/src/kernel/blocks/dbdict/Dbdict.cpp +1 -1

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +1 -1

No files found.
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -2584,7 +2584,7 @@ Dbdict::restartCreateTab_readTableConf(Signal* signal,
 			 c_readTableRecord.tableId,
 			 parseRecord.errorCode);
    progError(__LINE__, 
-	      ERR_INVALID_CONFIG,
+	      NDBD_EXIT_INVALID_CONFIG,
 	      buf);
    ndbrequire(parseRecord.errorCode == 0);
  }

--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -16176,7 +16176,7 @@ error:
 		       "Unable to restart, failed while reading redo."
 		       " Likely invalid change of configuration");
  progError(__LINE__, 
-	    ERR_INVALID_CONFIG,
+	    NDBD_EXIT_INVALID_CONFIG,
 	    buf);
 }//Dblqh::findLogfile()