From: Date: September 20 2006 12:56pm
Subject: bk commit into 5.1 tree (lzhou:1.2292) BUG#21799
List-Archive: http://lists.mysql.com/commits/12251
X-Bug: 21799
Message-Id: <200609201056.k8KAugII029219@dev3-138.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
5.1 repository of root. When root 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@stripped, 2006-09-20 10:56:37+00:00, lzhou@stripped +1 -0
  BUG#21799 manual modify variable name.

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@stripped, 2006-09-20 10:56:35+00:00, lzhou@stripped +2 -2
    manual modify variable name.

# 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:	lzhou
# Host:	dev3-138.dev.cn.tlan
# Root:	/home/zhl/mysql/mysql-5.1/bug21799

--- 1.94/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2006-09-20 10:56:43 +00:00
+++ 1.95/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2006-09-20 10:56:43 +00:00
@@ -525,7 +525,7 @@
         int ret_code= poll_guard.wait_scan(3*timeout, nodeId, forceSend);
 	if (ret_code == 0 && seq == tp->getNodeSequence(nodeId)) {
 	  continue;
-	} else if(return_code == -1){
+	} else if(ret_code == -1){
 	  retVal = -1;
 	} else {
 	  idx = last;
@@ -1438,7 +1438,7 @@
 	    continue;
 	  }
 	  if(DEBUG_NEXT_RESULT) ndbout_c("return -1");
-	  if(return_code == -1){
+	  if(ret_code == -1){
 	    setErrorCode(4008);
 	  } else {
 	    setErrorCode(4028);