From: Ole John Aske
Date: October 21 2010 8:14am
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3320 to 3321)
List-Archive: http://lists.mysql.com/commits/121475
Message-Id: <20101021081447.069AF21D@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3321 Ole John Aske	2010-10-21 [merge]
      Merge from telco-spj branch

    modified:
      sql/ha_ndbcluster.cc
 3320 Ole John Aske	2010-10-21 [merge]
      merge from telco-spj branch

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/t/partition.test
      sql/opt_range.cc
      sql/opt_range.h
      sql/sql_select.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-10-15 21:04:14 +0000
+++ b/sql/ha_ndbcluster.cc	2010-10-21 08:14:23 +0000
@@ -7235,7 +7235,7 @@ int ha_ndbcluster::index_first(uchar *bu
   // Start the ordered index scan and fetch the first row
 
   // Only HA_READ_ORDER indexes get called by index_first
-  DBUG_RETURN(ordered_index_scan(0, 0, TRUE, FALSE, buf, NULL));
+  DBUG_RETURN(ordered_index_scan(0, 0, m_sorted, FALSE, buf, NULL));
 }
 
 
@@ -7243,7 +7243,7 @@ int ha_ndbcluster::index_last(uchar *buf
 {
   DBUG_ENTER("ha_ndbcluster::index_last");
   ha_statistic_increment(&SSV::ha_read_last_count);
-  DBUG_RETURN(ordered_index_scan(0, 0, TRUE, TRUE, buf, NULL));
+  DBUG_RETURN(ordered_index_scan(0, 0, m_sorted, TRUE, buf, NULL));
 }
 
 

No bundle (reason: useless for push emails).