bk commit into 5.1 tree (mskold:1.2425)

[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-06 23:48:53+01:00, mskold@stripped +5 -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.6

  mysql-test/r/ndb_read_multi_range.result@stripped, 2007-02-06 23:48:47+01:00,
mskold@stripped +0 -0
    Auto merged
    MERGE: 1.10.1.1

  mysql-test/t/ndb_read_multi_range.test@stripped, 2007-02-06 23:48:47+01:00,
mskold@stripped +0 -0
    Auto merged
    MERGE: 1.12.1.1

  sql/ha_ndbcluster.cc@stripped, 2007-02-06 23:48:47+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.384.1.4

  sql/ha_ndbcluster.h@stripped, 2007-02-06 23:48:48+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.162.1.1

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@stripped, 2007-02-06 23:48:48+01:00,
mskold@stripped +0 -0
    Auto merged
    MERGE: 1.104.1.1

# 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.107/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2007-02-06 23:49:02 +01:00
+++ 1.108/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2007-02-06 23:49:02 +01:00
@@ -1225,7 +1225,7 @@ NdbIndexScanOperation::setBound(const Nd
      * so it's safe to use [tIndexAttrId] 
      * (instead of looping as is NdbOperation::equal_impl)
      */
-    if(type == BoundEQ && tDistrKey)
+    if(type == BoundEQ && tDistrKey && !m_multi_range)
     {
       theNoOfTupKeyLeft--;
       return handle_distribution_key(valPtr, sizeInWords);
@@ -1311,7 +1311,8 @@ NdbIndexScanOperation::readTuples(LockMo
   const bool order_by = scan_flags & SF_OrderBy;
   const bool order_desc = scan_flags & SF_Descending;
   const bool read_range_no = scan_flags & SF_ReadRangeNo;
-  
+  m_multi_range = scan_flags & SF_MultiRange;
+
   int res = NdbScanOperation::readTuples(lm, scan_flags, parallel, batch);
   if(!res && read_range_no)
   {

--- 1.403/sql/ha_ndbcluster.cc	2007-02-06 23:49:02 +01:00
+++ 1.404/sql/ha_ndbcluster.cc	2007-02-06 23:49:02 +01:00
@@ -8231,7 +8231,7 @@ ha_ndbcluster::read_multi_range_first(KE
         }
         else if ((scanOp= m_active_trans->getNdbIndexScanOperation(idx, tab)) 
                  &&!scanOp->readTuples(lm, 0, parallelism, sorted, 
-				       FALSE, TRUE, need_pk)
+				       FALSE, TRUE, need_pk, TRUE)
                  &&!generate_scan_filter(m_cond_stack, scanOp)
                  &&!define_read_attrs(end_of_buffer-reclength, scanOp))
         {

--- 1.11/mysql-test/r/ndb_read_multi_range.result	2007-02-06 23:49:02 +01:00
+++ 1.12/mysql-test/r/ndb_read_multi_range.result	2007-02-06 23:49:02 +01:00
@@ -459,3 +459,10 @@ INSERT INTO t1 VALUES (1,1),(2,2),(3,3);
 UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);
 DROP TRIGGER testtrigger;
 DROP TABLE t1, t2;
+create table t2 (a int, b int, primary key (a), key ab (a,b)) engine=ndbcluster;
+insert into t2 values (1,1), (10,10);
+select * from t2 use index (ab) where a in(1,10) order by a;
+a	b
+1	1
+10	10
+drop table t2;

--- 1.13/mysql-test/t/ndb_read_multi_range.test	2007-02-06 23:49:02 +01:00
+++ 1.14/mysql-test/t/ndb_read_multi_range.test	2007-02-06 23:49:02 +01:00
@@ -301,3 +301,12 @@ UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2
 DROP TRIGGER testtrigger;
 
 DROP TABLE t1, t2;
+
+#bug#25821
+create table t2 (a int, b int, primary key (a), key ab (a,b)) engine=ndbcluster;
+
+insert into t2 values (1,1), (10,10);
+
+select * from t2 use index (ab) where a in(1,10) order by a;
+
+drop table t2;