bk commit into 5.1 tree (mskold:1.2427)

[Martin Skold]

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, 2007-02-07 11:44:41+01:00, mskold@stripped +3 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
  MERGE: 1.2372.7.8

  sql/ha_ndbcluster.cc@stripped, 2007-02-07 11:44:34+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.384.1.5

  sql/ha_ndbcluster.h@stripped, 2007-02-07 11:44:34+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.162.1.2

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@stripped, 2007-02-07 11:44:34+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.104.1.2

# 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/RESYNC

--- 1.108/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2007-02-07 11:44:52 +01:00
+++ 1.109/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2007-02-07 11:44:52 +01:00
@@ -1793,6 +1793,12 @@ NdbIndexScanOperation::reset_bounds(bool
 int
 NdbIndexScanOperation::end_of_bound(Uint32 no)
 {
+  DBUG_ENTER("end_of_bound");
+  DBUG_PRINT("info", ("Range number %u", no));
+  /* Check that SF_MultiRange has been specified if more
+     than one range is specified */
+  if (no > 0 && !m_multi_range)
+    DBUG_RETURN(-1);
   if(no < (1 << 13)) // Only 12-bits no of ranges
   {
     Uint32 bound_head = * m_first_bound_word;
@@ -1801,9 +1807,9 @@ NdbIndexScanOperation::end_of_bound(Uint
     
     m_first_bound_word = theKEYINFOptr + theTotalNrOfKeyWordInSignal;;
     m_this_bound_start = theTupKeyLen;
-    return 0;
+    DBUG_RETURN(0);
   }
-  return -1;
+  DBUG_RETURN(-1);
 }
 
 int

--- 1.404/sql/ha_ndbcluster.cc	2007-02-07 11:44:52 +01:00
+++ 1.405/sql/ha_ndbcluster.cc	2007-02-07 11:44:52 +01:00
@@ -2281,8 +2281,7 @@ int ha_ndbcluster::set_bounds(NdbIndexSc
           DBUG_PRINT("error", ("key %d unknown flag %d", j, p.key->flag));
           DBUG_ASSERT(FALSE);
           // Stop setting bounds but continue with what we have
-          op->end_of_bound(range_no);
-          DBUG_RETURN(0);
+          DBUG_RETURN(op->end_of_bound(range_no));
         }
       }
     }
@@ -2329,8 +2328,7 @@ int ha_ndbcluster::set_bounds(NdbIndexSc
 
     tot_len+= part_store_len;
   }
-  op->end_of_bound(range_no);
-  DBUG_RETURN(0);
+  DBUG_RETURN(op->end_of_bound(range_no));
 }
 
 /*