Commit 72a0f506 authored by unknown's avatar unknown

merge

parent b053fdbe
...@@ -2584,7 +2584,7 @@ Dbdict::restartCreateTab_readTableConf(Signal* signal, ...@@ -2584,7 +2584,7 @@ Dbdict::restartCreateTab_readTableConf(Signal* signal,
c_readTableRecord.tableId, c_readTableRecord.tableId,
parseRecord.errorCode); parseRecord.errorCode);
progError(__LINE__, progError(__LINE__,
ERR_INVALID_CONFIG, NDBD_EXIT_INVALID_CONFIG,
buf); buf);
ndbrequire(parseRecord.errorCode == 0); ndbrequire(parseRecord.errorCode == 0);
} }
......
...@@ -16176,7 +16176,7 @@ void Dblqh::findLogfile(Signal* signal, ...@@ -16176,7 +16176,7 @@ void Dblqh::findLogfile(Signal* signal,
"Unable to restart, failed while reading redo." "Unable to restart, failed while reading redo."
" Likely invalid change of configuration"); " Likely invalid change of configuration");
progError(__LINE__, progError(__LINE__,
ERR_INVALID_CONFIG, NDBD_EXIT_INVALID_CONFIG,
buf); 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