Merge perch.ndb.mysql.com:/home/jonas/src/41-work

into  perch.ndb.mysql.com:/home/jonas/src/50-work

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

@@ -2575,7 +2575,19 @@ Dbdict::restartCreateTab_readTableConf(Signal* signal,
   Uint32 sz = c_readTableRecord.noOfPages * ZSIZE_OF_PAGES_IN_WORDS; 
   SimplePropertiesLinearReader r(&pageRecPtr.p->word[0], sz);
   handleTabInfoInit(r, &parseRecord);
-  ndbrequire(parseRecord.errorCode == 0);
+  if (parseRecord.errorCode != 0)
+  {
+    char buf[255];
+    BaseString::snprintf(buf, sizeof(buf), 
+			 "Unable to restart, fail while creating table %d"
+			 " error: %d. Most likely change of configuration",
+			 c_readTableRecord.tableId,
+			 parseRecord.errorCode);
+    progError(__LINE__, 
+	      ERR_INVALID_CONFIG,
+	      buf);
+    ndbrequire(parseRecord.errorCode == 0);
+  }
   
   /* ---------------------------------------------------------------- */
   // We have read the table description from disk as part of system restart.

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

@@ -16154,8 +16154,22 @@ void Dblqh::findLogfile(Signal* signal,
     }//if
     locLogFilePtr.i = locLogFilePtr.p->nextLogFile;
     loopCount++;
+    if (loopCount >= flfLogPartPtr.p->noLogFiles &&
+	getNodeState().startLevel != NodeState::SL_STARTED)
+    {
+      goto error;
+    }
     ndbrequire(loopCount < flfLogPartPtr.p->noLogFiles);
   }//while
+
+error:
+  char buf[255];
+  BaseString::snprintf(buf, sizeof(buf), 
+		       "Unable to restart, failed while reading redo."
+		       " Likely invalid change of configuration");
+  progError(__LINE__, 
+	    ERR_INVALID_CONFIG,
+	    buf);
 }//Dblqh::findLogfile()
 
 /* ------------------------------------------------------------------------- */