bk commit into 4.1 tree (joreland:1.2272) BUG#10953

[jonas.oreland]

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.2272 05/05/30 11:55:47 joreland@stripped +2 -0
  bug#10953 - ndb - scan read wo/ getvalue cause NF (during NR)

  ndb/test/run-test/ndb-autotest.sh
    1.13 05/05/30 11:55:43 joreland@stripped +1 -1
    fix vars

  ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
    1.7 05/05/30 11:55:43 joreland@stripped +3 -0
    Don't send 0 length transid_ai

# 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:	joreland
# Host:	eel.ndb.mysql.com
# Root:	/home/jonas/src/mysql-4.1

--- 1.12/ndb/test/run-test/ndb-autotest.sh	Wed May 25 11:53:55 2005
+++ 1.13/ndb/test/run-test/ndb-autotest.sh	Mon May 30 11:55:43 2005
@@ -76,7 +76,7 @@
 # Validate that all interesting
 #   variables where set in conf
 ###############################
-vars="target base_dir src_clone install_dir build_dir hosts configure"
+vars="target base_dir src_clone_base install_dir build_dir hosts configure"
 if [ "$report" ]
 then
 	vars="$vars result_host result_path"

--- 1.6/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp	Wed Sep  8 13:42:42 2004
+++ 1.7/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp	Mon May 30 11:55:43 2005
@@ -133,6 +133,9 @@
                              Uint32 ToutBufIndex,
                              const Operationrec * const regOperPtr)
 {
+  if(ToutBufIndex == 0)
+    return;
+
   const BlockReference recBlockref = regOperPtr->recBlockref;
   const Uint32 sig0 = regOperPtr->tcOperationPtr;
   const Uint32 sig1 = regOperPtr->transid1;