merge

1efd256e · jonas@perch.ndb.mysql.com · 78e437e8 · 1efd256e · 1efd256e
Commit 1efd256e authored Feb 06, 2006 by jonas@perch.ndb.mysql.com
Showing with 2 additions and 2 deletions

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

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

No files found.
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -3001,7 +3001,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/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -16035,7 +16035,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()