Commit 252cbd4d 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/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/restore.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
parents 04fa9343 10f55b02

storage/ndb/include/kernel/signaldata/LqhKey.hpp

+1 −0
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ class LqhKeyRef { 
   * Reciver(s)

   */

  friend class Dbtc;      

  friend class Restore;



  /**

   * Sender(s)

storage/ndb/src/kernel/blocks/ERROR_codes.txt

+11 −2
Original line number Diff line number Diff line 
Next QMGR 1

Next NDBCNTR 1000

Next NDBCNTR 1001

Next NDBFS 2000

Next DBACC 3002

Next DBTUP 4024

Next DBTUP 4029

Next DBLQH 5045

Next DBDICT 6007

Next DBDIH 7181
@@ -512,3 +512,12 @@ Dbtup: 


4022 - addTuxEntries - fail before add of first entry

4023 - addTuxEntries - fail add of last entry (the entry for last index)



4025: Fail all inserts with out of memory

4026: Fail one insert with oom

4027: Fail inserts randomly with oom

4028: Fail one random insert with oom



NDBCNTR:



1000: Crash insertion on SystemError::CopyFragRef

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

+16 −3
Original line number Diff line number Diff line
@@ -10570,6 +10570,15 @@ void Dblqh::copyCompletedLab(Signal* signal) 
    closeCopyLab(signal);

    return;

  }//if









  if (scanptr.p->scanState == ScanRecord::WAIT_LQHKEY_COPY &&









      scanptr.p->scanErrorCounter)









  {









    jam();









    closeCopyLab(signal);









    return;









  }









  









  if (scanptr.p->scanState == ScanRecord::WAIT_LQHKEY_COPY) {









    jam();









/*---------------------------------------------------------------------------*/








@@ -10658,13 +10667,16 @@ void Dblqh::continueCopyAfterBlockedLab(Signal* signal)







void Dblqh::copyLqhKeyRefLab(Signal* signal) 









{









  ndbrequire(tcConnectptr.p->transid[1] == signal->theData[4]);









  tcConnectptr.p->copyCountWords -= signal->theData[3];









  Uint32 copyWords = signal->theData[3];









  scanptr.i = tcConnectptr.p->tcScanRec;









  c_scanRecordPool.getPtr(scanptr);









  scanptr.p->scanErrorCounter++;









  tcConnectptr.p->errorCode = terrorCode;









  closeCopyLab(signal);









  return;









  









  LqhKeyConf* conf = (LqhKeyConf*)signal->getDataPtrSend();









  conf->transId1 = copyWords;









  conf->transId2 = tcConnectptr.p->transid[1];









  copyCompletedLab(signal);









}//Dblqh::copyLqhKeyRefLab()

















void Dblqh::closeCopyLab(Signal* signal) 








@@ -10675,6 +10687,7 @@ void Dblqh::closeCopyLab(Signal* signal)







// Wait until all of those have arrived until we start the









// close process.









/*---------------------------------------------------------------------------*/









    scanptr.p->scanState = ScanRecord::WAIT_LQHKEY_COPY;









    jam();









    return;









  }//if
































storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp



+22
−0






























Original line number
Diff line number
Diff line







@@ -1260,6 +1260,28 @@ int Dbtup::handleInsertReq(Signal* signal,







    shrink_tuple(req_struct, sizes+2, regTabPtr, true);









  }



















  if (ERROR_INSERTED(4025))









  {









    goto mem_error;









  }



















  if (ERROR_INSERTED(4026))









  {









    CLEAR_ERROR_INSERT_VALUE;









    goto mem_error;









  }



















  if (ERROR_INSERTED(4027) && (rand() % 100) > 25)









  {









    goto mem_error;









  }









 









  if (ERROR_INSERTED(4028) && (rand() % 100) > 25)









  {









    CLEAR_ERROR_INSERT_VALUE;









    goto mem_error;









  }









  









  /**









   * Alloc memory









   */
































storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp



+1
−1






























Original line number
Diff line number
Diff line







@@ -112,6 +112,7 @@ Dbtup::Dbtup(Block_context& ctx, Pgman* pgman)







  cnoOfAllocatedPages = 0;









  









  initData();









  CLEAR_ERROR_INSERT_VALUE;









}//Dbtup::Dbtup()



















Dbtup::~Dbtup() 








@@ -262,7 +263,6 @@ void Dbtup::execSTTOR(Signal* signal)







  switch (startPhase) {









  case ZSTARTPHASE1:









    ljam();









    CLEAR_ERROR_INSERT_VALUE;









    ndbrequire((c_lqh= (Dblqh*)globalData.getBlock(DBLQH)) != 0);









    ndbrequire((c_tsman= (Tsman*)globalData.getBlock(TSMAN)) != 0);









    ndbrequire((c_lgman= (Lgman*)globalData.getBlock(LGMAN)) != 0);