bk commit into 5.1 tree (tomas:1.2029) BUG#20197

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2029 06/06/12 14:37:40 tomas@stripped +1 -0
  Bug #20197 NF with scan can cause failure during NR
  - also close scan which are in "delivered" state, as it's impossible to release locks
afterwards

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.100 06/06/12 14:37:18 tomas@stripped +12 -0
    Bug #20197 NF with scan can cause failure during NR
    - 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-alcatel

--- 1.99/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-06-01 10:46:00 +02:00
+++ 1.100/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-06-12 14:37:18 +02:00
@@ -7060,6 +7060,18 @@
 	  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();