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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-02-10 10:11:30 +01:00
commit af875527fa
2 changed files with 2 additions and 2 deletions

View file

@ -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);
}

View file

@ -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()