bk commit into 4.1 tree (jonas:1.2508) BUG#20197

[jonas]

Below is the list of changes that have just been committed into a local
4.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.2508 06/06/21 14:00:26 jonas@stripped +1 -0
  ndb - bug#20197
    also close scan which are in "delivered" state, as it's impossible to release locks afterwards
  
    backport from 5.1

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.67 06/06/21 14:00:24 jonas@stripped +12 -0
    ndb - bug#20197
      also close scan which are in "delivered" state, as it's impossible to release locks afterwards

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

--- 1.66/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-06-01 08:24:02 +02:00
+++ 1.67/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-06-21 14:00:24 +02:00
@@ -6978,6 +6978,18 @@ void Dbtc::checkScanActiveInFailedLqh(Si
 	  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();