Commit 32c3009d authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1
parents c3272ae7 0e6d4fd0

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

+17 −16
Original line number Diff line number Diff line
@@ -8573,12 +8573,10 @@ Uint32 Dblqh::initScanrec(const ScanFragReq* scanFragReq) 
  /**

   * Used for scan take over

   */

  {

  FragrecordPtr tFragPtr;

  tFragPtr.i = fragptr.p->tableFragptr;

  ptrCheckGuard(tFragPtr, cfragrecFileSize, fragrecord);

  scanptr.p->fragPtrI = fragptr.p->tableFragptr;

  }

  

  /**

   * !idx uses 1 - (MAX_PARALLEL_SCANS_PER_FRAG - 1)  =  1-11
@@ -8587,7 +8585,7 @@ Uint32 Dblqh::initScanrec(const ScanFragReq* scanFragReq) 
  Uint32 start = (idx ? MAX_PARALLEL_SCANS_PER_FRAG : 1 );

  Uint32 stop = (idx ? MAX_PARALLEL_INDEX_SCANS_PER_FRAG : MAX_PARALLEL_SCANS_PER_FRAG - 1);

  stop += start;

  Uint32 free = fragptr.p->m_scanNumberMask.find(start);

  Uint32 free = tFragPtr.p->m_scanNumberMask.find(start);

    

  if(free == Fragrecord::ScanNumberMask::NotFound || free >= stop){

    jam();
@@ -8607,9 +8605,8 @@ Uint32 Dblqh::initScanrec(const ScanFragReq* scanFragReq) 
    return ZOK;

  }

  

  

  scanptr.p->scanNumber = free;

  fragptr.p->m_scanNumberMask.clear(free);// Update mask  

  tFragPtr.p->m_scanNumberMask.clear(free);// Update mask  

  

  LocalDLList<ScanRecord> active(c_scanRecordPool, fragptr.p->m_activeScans);

  active.add(scanptr);
@@ -8693,8 +8690,12 @@ void Dblqh::finishScanrec(Signal* signal) 
  LocalDLList<ScanRecord> scans(c_scanRecordPool, fragptr.p->m_activeScans);

  scans.release(scanptr);

  

  FragrecordPtr tFragPtr;

  tFragPtr.i = scanptr.p->fragPtrI;

  ptrCheckGuard(tFragPtr, cfragrecFileSize, fragrecord);









  const Uint32 scanNumber = scanptr.p->scanNumber;









  ndbrequire(!fragptr.p->m_scanNumberMask.get(scanNumber));









  ndbrequire(!tFragPtr.p->m_scanNumberMask.get(scanNumber));









  ScanRecordPtr restart;

















  /**








@@ -8702,13 +8703,13 @@ void Dblqh::finishScanrec(Signal* signal)







   */









  if(scanNumber == NR_ScanNo || !queue.first(restart)){









    jam();









    fragptr.p->m_scanNumberMask.set(scanNumber);









    tFragPtr.p->m_scanNumberMask.set(scanNumber);









    return;









  }

















  if(ERROR_INSERTED(5034)){









    jam();









    fragptr.p->m_scanNumberMask.set(scanNumber);









    tFragPtr.p->m_scanNumberMask.set(scanNumber);









    return;









  }