From: Date: December 14 2006 4:53pm
Subject: bk commit into 5.1 tree (mskold:1.2365) BUG#19956
List-Archive: http://lists.mysql.com/commits/16961
X-Bug: 19956
Message-Id: <20061214155301.CE8D220BE07@linux.site>

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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-12-14 16:52:50+01:00, mskold@stripped +1 -0
  bug#19956  Problems with VARCHAR primary key and BLOB fields:put back removed error handling for HA_ERR_KEY_NOT_FOUND

  sql/ha_ndbcluster.cc@stripped, 2006-12-14 16:52:36+01:00, mskold@stripped +6 -3
    bug#19956  Problems with VARCHAR primary key and BLOB fields:put back removed error handling for HA_ERR_KEY_NOT_FOUND

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb

--- 1.377/sql/ha_ndbcluster.cc	2006-12-14 16:53:01 +01:00
+++ 1.378/sql/ha_ndbcluster.cc	2006-12-14 16:53:01 +01:00
@@ -3478,8 +3478,9 @@ int ha_ndbcluster::read_range_first_to_b
     {
       if (m_active_cursor && (error= close_scan()))
         DBUG_RETURN(error);
-      DBUG_RETURN(pk_read(start_key->key, start_key->length, buf,
-                          part_spec.start_part));
+      error= pk_read(start_key->key, start_key->length, buf,
+		     part_spec.start_part);
+      DBUG_RETURN(error == HA_ERR_KEY_NOT_FOUND ? HA_ERR_END_OF_FILE : error);
     }
     break;
   case UNIQUE_ORDERED_INDEX:
@@ -3490,7 +3491,9 @@ int ha_ndbcluster::read_range_first_to_b
     {
       if (m_active_cursor && (error= close_scan()))
         DBUG_RETURN(error);
-      DBUG_RETURN(unique_index_read(start_key->key, start_key->length, buf));
+
+      error= unique_index_read(start_key->key, start_key->length, buf);
+      DBUG_RETURN(error == HA_ERR_KEY_NOT_FOUND ? HA_ERR_END_OF_FILE : error);
     }
     else if (type == UNIQUE_INDEX)
       DBUG_RETURN(unique_index_scan(key_info,