From: Ole John Aske
Date: October 21 2010 8:12am
Subject: bzr commit into mysql-5.1-telco-7.0-spj branch (ole.john.aske:3229)
List-Archive: http://lists.mysql.com/commits/121472
Message-Id: <20101021081218.6FA3C21D@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0848555543984115202=="

--===============0848555543984115202==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj/ based on revid:ole.john.aske@stripped

 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
=== 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));
 }
 
 


--===============0848555543984115202==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   th8ei4al2vmp7hru
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj/
# testament_sha1: 9e0447f951240361b6bbcde5c8eb7e4ca2b85a36
# timestamp: 2010-10-21 10:12:18 +0200
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@stripped\
#   ox2nq9t51m89t9l7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW0M7WkAAaxfgAAQUOf//3eV
ngC////wUAQWzveeqvdN2O96mvQkkmRMlPGJqemCTTSPEyT0m00mjTaQaCSgmo2gJtTyqfqn6p+k
ajymgGCAGgaCSITImqftSnsVPCR5T0R6j1BiaaANADakpP0ARD1PUY1NPUHqGnqDaAg0B6glFU/C
NRtU2k9TwkAPJqepkZGQDQBtwzKH1x/RKUgi3CTkFWybHTe17Drr3ddbBjCZ9vkHhKehmdVaDt3T
1lsBlj8nIF/0/vL508MZUtMYyff+nLGH1Rwqz2z1136Nw5hTaLBvE2eJqJiS0biRLKdBHQwkMler
Wu01Y8nVaKWTZFG9IwXWIzNSyRp72tfVwlnxYd8QcVqcsVrupA8Qsj1QuSUZ5T4uQ9JiBowrUMtz
xCpRCKBWZrZbmNrxiQhEy43KJ7JOYEfmaJuJsqFazHX9NkrssjHmMN2ybRq8dItw0HsEZILEnL32
OwYEYsh4pnMzFPR6t4PrpY4dDqH6qse3zX8TXfNWK4TVHxYci4wxk3RYbc6kjEiJnIfzkZ4V4zVc
qKj9+OOzMOL1diSgb4XTIRrKhztsLR/QaAXbVBFmo22VkstMNjp/Ww+WjFXjQ2wMJLDUWxXAVzGd
JDxQwWsGQ6lda6yTfJQ9YnWlrE2mbs2FbCJgSNui4LSs8Z5RYnm+iLS1OYsiUE02kUCdG5nYY4bL
m57Fq3XwSPQmm9HxMmHH18IHt7s0nQfj4wIuQ49SMeofscfRIOJiQzkR58FNeSoUOxNWjvHmYYGk
lU5DPhBeXdySMq+eWINouP2z0REMedrvkjmkVHgNL8X8Cyujjw+kFTcQHzm9FcaLy6FpFUsxz5Et
7S3OZIerKJQXPTGhNg1eOsDRHM8S8008lYducVv7r3IFm8elnfXz6W74tSRPUv/uTYd9OXK9IlwO
Tb7QduqjN/FgZl5z16Oedv9R1AYa6p2s93GWetnGj4Tk96wuc402G/smJQjJF+CIfroLSnWUdvWM
4zPNvYZpyDfzZ3XXuW3YNlRj3TlgmuDf6kxCX2ONwLcKOgJFFYlpzUOpyfdNisKcSiJi8JCLN1lD
aZVTSXhfC093t5+1EMo0EfkCkvSxKtECUmDrGO5k++yYFWCcsVV0PNJNGe8gLwG5Vxq2u6pmb6HK
e4UylLYbYdMy0dIZXwiG5MPF+PQabSZ86GYY4elU0NBhvuBUJVK1M6yJBML0kJ7wMA9RBeldUVr1
rmZWJhXlmWlmUSVB9kHu6XsncHMmuBTb5b3EyS64ON7Il0EaOUD2kuPYWqvHKWBJTZbRKxiM1SEo
tEB1U6QbYC4UIhBNH44uuWrETm+cNVUKtg8e06xRhrMXd4HUr8YpsD3xE/fPZTAhItCxRY2/Y5Wu
8rxcjdm7pPVVG3Je65UDgKJVCSqMGjVwYs1MajH0Eh6D/8XckU4UJBtDO1pA


--===============0848555543984115202==--