bk commit into 5.1 tree (jonas:1.2232) BUG#20442

[jonas]

Below is the list of changes that have just been committed into a local
5.1 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.2232 06/06/28 12:16:10 jonas@stripped +1 -0
  ndb - 
    50->51 merge of bug#20442, force close scan (with locks)

  storage/ndb/src/ndbapi/NdbScanOperation.cpp
    1.86 06/06/28 12:16:07 jonas@stripped +3 -8
    merge

# 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/51-work

--- 1.85/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2006-06-28 11:32:25 +02:00
+++ 1.86/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2006-06-28 12:16:07 +02:00
@@ -1587,7 +1587,6 @@ NdbScanOperation::close_impl(Transporter
   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);
     
@@ -1605,8 +1604,7 @@ NdbScanOperation::close_impl(Transporter
       setErrorCode(4008);
       return -1;
     }
-    checkForceSend(forceSend);
-
+    
     /**
      * If no receiver is outstanding...
      *   set it to 1 as execCLOSE_SCAN_REP resets it
@@ -1615,9 +1613,7 @@ NdbScanOperation::close_impl(Transporter
     
     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);
+      int return_code = poll_guard->wait_scan(WAITFOR_SCAN_TIMEOUT, nodeId, forceSend);
       switch(return_code){
       case 0:
 	break;
@@ -1639,8 +1635,7 @@ NdbScanOperation::close_impl(Transporter
    */
   while(theError.code == 0 && m_sent_receivers_count)
   {
-    int return_code= poll_guard->wait_scan(WAITFOR_SCAN_TIMEOUT, nodeId,
-                                           false);
+    int return_code= poll_guard->wait_scan(WAITFOR_SCAN_TIMEOUT, nodeId, forceSend);
     switch(return_code){
     case 0:
       break;