From: jonas
Date: June 28 2006 11:01am
Subject: bk commit into 5.0 tree (jonas:1.2209)
List-Archive: http://lists.mysql.com/commits/8395
Message-Id: <20060628110141.4E56C426155@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2209 06/06/28 13:01:36 jonas@stripped +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  ndb/src/ndbapi/NdbScanOperation.cpp
    1.73 06/06/28 13:01:32 jonas@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.0/RESYNC

--- 1.72/ndb/src/ndbapi/NdbScanOperation.cpp	2006-06-28 08:40:16 +02:00
+++ 1.73/ndb/src/ndbapi/NdbScanOperation.cpp	2006-06-28 13:01:32 +02:00
@@ -1513,6 +1513,66 @@ NdbScanOperation::close_impl(Transporter
     return -1;
   }
   
+  bool holdLock = false;
+  if (theSCAN_TABREQ)
+  {
+    ScanTabReq * req = CAST_PTR(ScanTabReq, theSCAN_TABREQ->getDataPtrSend());
+    holdLock = ScanTabReq::getHoldLockFlag(req->requestInfo);
+  }
+
+  /**
+   * When using locks, force close of scan directly
+   */
+  if (holdLock && theError.code == 0 && 
+      (m_sent_receivers_count + m_conf_receivers_count + m_api_receivers_count))
+  {
+    TransporterFacade * tp = TransporterFacade::instance();
+    NdbApiSignal tSignal(theNdb->theMyRef);
+    tSignal.setSignal(GSN_SCAN_NEXTREQ);
+    
+    Uint32* theData = tSignal.getDataPtrSend();
+    Uint64 transId = theNdbCon->theTransactionId;
+    theData[0] = theNdbCon->theTCConPtr;
+    theData[1] = 1;
+    theData[2] = transId;
+    theData[3] = (Uint32) (transId >> 32);
+
+    tSignal.setLength(4);
+    int ret = tp->sendSignal(&tSignal, nodeId);
+    if (ret)
+    {
+      setErrorCode(4008);
+      return -1;
+    }
+    checkForceSend(forceSend);
+
+    /**
+     * If no receiver is outstanding...
+     *   set it to 1 as execCLOSE_SCAN_REP resets it
+     */
+    m_sent_receivers_count = m_sent_receivers_count ? m_sent_receivers_count : 1;
+    
+    while(theError.code == 0 && (m_sent_receivers_count + m_conf_receivers_count))
+    {
+      theNdb->theImpl->theWaiter.m_node = nodeId;
+      theNdb->theImpl->theWaiter.m_state = WAIT_SCAN;
+      int return_code = theNdb->receiveResponse(WAITFOR_SCAN_TIMEOUT);
+      switch(return_code){
+      case 0:
+	break;
+      case -1:
+	setErrorCode(4008);
+      case -2:
+	m_api_receivers_count = 0;
+	m_conf_receivers_count = 0;
+	m_sent_receivers_count = 0;
+	theNdbCon->theReleaseOnClose = true;
+	return -1;
+      }
+    }
+    return 0;
+  }
+  
   /**
    * Wait for outstanding
    */