Commit 070b77d4 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
parents 96127cc2 59ce334d

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

+5 −8
Original line number Diff line number Diff line
@@ -2123,16 +2123,13 @@ void Dbdih::execINCL_NODECONF(Signal* signal) 
  TstartNode_or_blockref = signal->theData[0];

  TsendNodeId = signal->theData[1];









  static Uint32 blocklist[] = {









    clocallqhblockref,









    clocaltcblockref,









    cdictblockref,









    0,









    0,









    0









  };









  Uint32 blocklist[6];









  blocklist[0] = clocallqhblockref;









  blocklist[1] = clocaltcblockref;









  blocklist[2] = cdictblockref;









  blocklist[3] = numberToRef(BACKUP, getOwnNodeId());









  blocklist[4] = numberToRef(SUMA, getOwnNodeId());









  blocklist[5] = 0;









  









  for (Uint32 i = 0; blocklist[i] != 0; i++)









  {
































storage/ndb/test/src/NdbRestarts.cpp



+2
−2






























Original line number
Diff line number
Diff line







@@ -630,7 +630,7 @@ int restartNFDuringNR(NdbRestarter& _restarter,







    int nodeId = _restarter.getDbNodeId(randomId);









    int error = NFDuringNR_codes[i];









    









    g_info << _restart->m_name << ": node = " << nodeId 









    g_err << _restart->m_name << ": node = " << nodeId 









	  << " error code = " << error << endl;









    









    CHECK(_restarter.restartOneDbNode(nodeId, false, true, true) == 0,