mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +01:00
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:
commit
af875527fa
2 changed files with 2 additions and 2 deletions
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue