Commit 184e9f0c authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents 9f542541 3841ca40

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

+8 −18
Original line number Diff line number Diff line
@@ -13778,17 +13778,11 @@ void Dblqh::execSTART_FRAGREQ(Signal* signal) 
    c_lcp_complete_fragments.add(fragptr);









    if(lcpNo == ZNIL)









    {









      for (Uint32 i = 0; i<MAX_FRAG_PER_NODE; i++)









      {









	if (tabptr.p->fragrec[i] != RNIL)









    {









      signal->theData[0] = tabptr.i;









	  signal->theData[1] = tabptr.p->fragid[i];









      signal->theData[1] = fragId;









      sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB);









    }









      }









    }









    









    return;









  }//if








@@ -13854,21 +13848,17 @@ void Dblqh::execRESTORE_LCP_CONF(Signal* signal)







   */









  tabptr.i = fragptr.p->tabRef;









  ptrCheckGuard(tabptr, ctabrecFileSize, tablerec);









  for (Uint32 i = 0; i<MAX_FRAG_PER_NODE; i++)









  {









    if (tabptr.p->fragrec[i] != RNIL)









    {









      signal->theData[0] = tabptr.i;









      signal->theData[1] = tabptr.p->fragid[i];

















  signal->theData[0] = fragptr.p->tabRef;









  signal->theData[1] = fragptr.p->fragId;









  sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB);









    }









  }









  









  if (!c_lcp_waiting_fragments.isEmpty())









  {









    send_restore_lcp(signal);









    return;









  }

















  if (c_lcp_restoring_fragments.isEmpty() && cstartRecReq == ZTRUE)









  {









    jam();