Commit eb21ec54 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1-fix 

into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
parents 72d56253 abb1963d

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

+14 −8
Original line number Diff line number Diff line
@@ -7320,6 +7320,8 @@ void Dblqh::closeScanRequestLab(Signal* signal) 
    scanptr.p->m_curr_batch_size_rows = 0;

    scanptr.p->m_curr_batch_size_bytes= 0;

    sendScanFragConf(signal, ZTRUE);

    abort_scan(signal, scanptr.i, 0);

    return;

    break;

  case TcConnectionrec::SCAN_TUPKEY:

  case TcConnectionrec::SCAN_FIRST_STOPPED:
@@ -7711,6 +7713,9 @@ void Dblqh::abort_scan(Signal* signal, Uint32 scan_ptr_i, Uint32 errcode){ 
  tcConnectptr.p->transactionState = TcConnectionrec::IDLE;

  tcConnectptr.p->abortState = TcConnectionrec::ABORT_ACTIVE;









  if(errcode)









  {









    jam();









    ScanFragRef * ref = (ScanFragRef*)&signal->theData[0];









    ref->senderData = tcConnectptr.p->clientConnectrec;









    ref->transId1 = tcConnectptr.p->transid[0];








@@ -7718,6 +7723,7 @@ void Dblqh::abort_scan(Signal* signal, Uint32 scan_ptr_i, Uint32 errcode){







    ref->errorCode = errcode;









    sendSignal(tcConnectptr.p->clientBlockref, GSN_SCAN_FRAGREF, signal, 









	       ScanFragRef::SignalLength, JBB);









  }









  deleteTransidHash(signal);









  releaseOprec(signal);









  releaseTcrec(signal, tcConnectptr);