Commit 79f5a97f authored by unknown's avatar unknown
Browse files

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

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


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
parents a4e5d04d b352d9d1

ndb/include/ndbapi/NdbIndexScanOperation.hpp

+4 −2
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ public: 
   * @param parallel No of fragments to scan in parallel (0=max)

   */ 

  virtual int readTuples(LockMode lock_mode = LM_Read, 

                         Uint32 scan_flags = 0, Uint32 parallel = 0);

                         Uint32 scan_flags = 0, 

			 Uint32 parallel = 0,

			 Uint32 batch = 0);



#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL

  /**
@@ -69,7 +71,7 @@ public: 
      (SF_ReadRangeNo & -(Int32)read_range_no) | 

      (SF_KeyInfo & -(Int32)keyinfo);

    

    return readTuples(lock_mode, scan_flags, parallel);

    return readTuples(lock_mode, scan_flags, parallel, batch);

  }

#endif

ndb/include/ndbapi/NdbScanOperation.hpp

+3 −1
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ public: 
   */ 

  virtual

  int readTuples(LockMode lock_mode = LM_Read, 

                 Uint32 scan_flags = 0, Uint32 parallel = 0);

                 Uint32 scan_flags = 0, 

		 Uint32 parallel = 0,

		 Uint32 batch = 0);



#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED

  /**

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

+4 −4
Original line number Diff line number Diff line
@@ -7373,15 +7373,15 @@ void Dblqh::scanLockReleasedLab(Signal* signal) 
      scanptr.p->m_curr_batch_size_rows = 0;

      scanptr.p->m_curr_batch_size_bytes = 0;

      closeScanLab(signal);

    } else if (scanptr.p->m_last_row && !scanptr.p->scanLockHold) {

      jam();

      closeScanLab(signal);

      return;

    } else if (scanptr.p->check_scan_batch_completed() &&

               scanptr.p->scanLockHold != ZTRUE) {

      jam();

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

      sendScanFragConf(signal, ZFALSE);

    } else if (scanptr.p->m_last_row && !scanptr.p->scanLockHold) {

      jam();

      closeScanLab(signal);

      return;

    } else {

      jam();

      /*

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

+12 −0
Original line number Diff line number Diff line
@@ -7047,6 +7047,18 @@ void Dbtc::checkScanActiveInFailedLqh(Signal* signal, 
	  found = true;

	}

      }



      ScanFragList deliv(c_scan_frag_pool, scanptr.p->m_delivered_scan_frags);

      for(deliv.first(ptr); !ptr.isNull(); deliv.next(ptr))

      {

	jam();

	if (refToNode(ptr.p->lqhBlockref) == failedNodeId)

	{

	  jam();

	  found = true;

	  break;

	}

      }

    }

    if(found){

      jam();

ndb/src/kernel/vm/RequestTracker.hpp

+2 −2
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ public: 
  void init() { m_confs.clear(); m_nRefs = 0; }



  template<typename SignalClass>

  void init(SafeCounterManager& mgr,

  bool init(SafeCounterManager& mgr,

	    NodeReceiverGroup rg, Uint16 GSN, Uint32 senderData)

  {

    init();

    SafeCounter tmp(mgr, m_sc);

    tmp.init<SignalClass>(rg, GSN, senderData);

    return tmp.init<SignalClass>(rg, GSN, senderData);

  }



  bool ignoreRef(SafeCounterManager& mgr, Uint32 nodeId)