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

 3229 Ole John Aske	2010-10-21
      Fixes related to http://lists.mysql.com/commits/121334 which are specific for the NDB handler implementation.
      
      Always use calculated 'sorted' property instead of hardcode it to TRUE/FALSE.

    modified:
      sql/ha_ndbcluster.cc
 3228 Ole John Aske	2010-10-21
      
      Updated 'main.partitions' testcase after http://lists.mysql.com/commits/121334
      
      As resultset wo/ explicit 'order by' is no longer implicit sorted, a '--sorted_result' should be 
      added to testcase which makes assumptions about the result being sorted.

    modified:
      mysql-test/t/partition.test
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-10-15 14:42:00 +0000
+++ b/sql/ha_ndbcluster.cc	2010-10-21 08:12:14 +0000
@@ -6970,7 +6970,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));
 }
 
 
@@ -6978,7 +6978,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).