mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-21 15:55:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

ndb -

Browse source 
post merge fixes


ndb/include/mgmapi/ndbd_exit_codes.h:
  post merge
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  post merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  post merge
ndb/src/kernel/error/ndbd_exit_codes.c:
  post merge
ndb/tools/desc.cpp:
  post merge
This commit is contained in:
unknown 2006-03-22 15:46:51 +01:00
commit dec75d4ce2
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ndb/include/mgmapi/ndbd_exit_codes.h
View file

@ -74,9 +74,7 @@ typedef ndbd_exit_classification_enum ndbd_exit_classification;
#define NDBD_EXIT_SR_OTHERNODEFAILED 2308
#define NDBD_EXIT_NODE_NOT_DEAD 2309
#define NDBD_EXIT_SR_REDOLOG 2310
/*
#define NDBD_EXIT_SR_RESTARTCONFLICT 2311
*/
#define NDBD_EXIT_NO_MORE_UNDOLOG 2312
#define NDBD_EXIT_SR_UNDOLOG 2313
#define NDBD_EXIT_MEMALLOC 2327

2
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file

@ -1610,7 +1610,7 @@ void Dbdih::execSTART_PERMREF(Signal* signal)
" with --initial as partial start has been performed"
" and this filesystem is unusable");
progError(__LINE__,
ERR_SR_RESTARTCONFLICT,
NDBD_EXIT_SR_RESTARTCONFLICT,
buf);
ndbrequire(false);
}

1
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file

@ -18572,7 +18572,6 @@ Dblqh::execDUMP_STATE_ORD(Signal* signal)
TcConnectionrec *regTcConnectionrec = tcConnectionrec;
Uint32 ttcConnectrecFileSize = ctcConnectrecFileSize;
Uint32 arg = dumpState->args[0];
if(arg == 2306)
{
for(Uint32 i = 0; i<1024; i++)

3
ndb/src/kernel/error/ndbd_exit_codes.c
View file

@ -85,6 +85,9 @@ static const ErrStruct errArray[] =
*/
{NDBD_EXIT_OS_SIGNAL_RECEIVED, XIE, "Error OS signal received"},
{NDBD_EXIT_SR_RESTARTCONFLICT, XRE,
"Partial system restart causing conflicting file systems"},
/* VM */
{NDBD_EXIT_OUT_OF_LONG_SIGNAL_MEMORY, XCR,
"Signal lost, out of long signal memory, please increase LongMessageBuffer"},

8
ndb/tools/desc.cpp
View file

@ -119,7 +119,7 @@ int main(int argc, char** argv){
ndbout << endl;
if (_partinfo)
print_part_info(pMyNdb, pTab);
print_part_info(&MyNdb, pTab);
}
else
ndbout << argv[i] << ": " << dict->getNdbError() << endl;
@ -159,8 +159,8 @@ void print_part_info(Ndb* pNdb, NDBT_Table* pTab)
if (pOp == NULL)
break;
NdbResultSet* rs= pOp->readTuples(NdbOperation::LM_CommittedRead);
if (rs == 0)
int rs = pOp->readTuples(NdbOperation::LM_CommittedRead);
if (rs != 0)
break;
if (pOp->interpret_exit_last_row() != 0)
@ -183,7 +183,7 @@ void print_part_info(Ndb* pNdb, NDBT_Table* pTab)
ndbout << g_part_info[i].m_title << "\t";
ndbout << endl;
while(rs->nextResult() == 0)
while(pOp->nextResult() == 0)
{
for(i = 0; g_part_info[i].m_title != 0; i++)
{