Commit dec75d4c authored by unknown's avatar unknown
Browse files

ndb - 

  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
parent be47bcec

ndb/include/mgmapi/ndbd_exit_codes.h

+0 −2
Original line number Diff line number Diff line
@@ -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

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

  }

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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++)

























ndb/src/kernel/error/ndbd_exit_codes.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -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"},
































ndb/tools/desc.cpp



+4
−4






























Original line number
Diff line number
Diff line







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









      {