Skip to content

M
mariadb
Commit af875527 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files
Options

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
parents b8d64346 0c559223
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file @ af875527
...@@ -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);
} }
......
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file @ af875527
...@@ -16176,7 +16176,7 @@ error: ...@@ -16176,7 +16176,7 @@ error:
"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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7