Commit 669a2bfa authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com

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

into  perch.ndb.mysql.com:/home/jonas/src/50-work
parents 8dce5e19 78bd6d93
...@@ -2575,7 +2575,19 @@ Dbdict::restartCreateTab_readTableConf(Signal* signal, ...@@ -2575,7 +2575,19 @@ Dbdict::restartCreateTab_readTableConf(Signal* signal,
Uint32 sz = c_readTableRecord.noOfPages * ZSIZE_OF_PAGES_IN_WORDS; Uint32 sz = c_readTableRecord.noOfPages * ZSIZE_OF_PAGES_IN_WORDS;
SimplePropertiesLinearReader r(&pageRecPtr.p->word[0], sz); SimplePropertiesLinearReader r(&pageRecPtr.p->word[0], sz);
handleTabInfoInit(r, &parseRecord); 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. // We have read the table description from disk as part of system restart.
......
...@@ -16154,8 +16154,22 @@ void Dblqh::findLogfile(Signal* signal, ...@@ -16154,8 +16154,22 @@ void Dblqh::findLogfile(Signal* signal,
}//if }//if
locLogFilePtr.i = locLogFilePtr.p->nextLogFile; locLogFilePtr.i = locLogFilePtr.p->nextLogFile;
loopCount++; loopCount++;
if (loopCount >= flfLogPartPtr.p->noLogFiles &&
getNodeState().startLevel != NodeState::SL_STARTED)
{
goto error;
}
ndbrequire(loopCount < flfLogPartPtr.p->noLogFiles); ndbrequire(loopCount < flfLogPartPtr.p->noLogFiles);
}//while }//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() }//Dblqh::findLogfile()
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
......
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