From: magnus.blaudd
Date: June 8 2011 11:27am
Subject: bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3313)
List-Archive: http://lists.mysql.com/commits/138862
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6629805694708024017=="

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

#At file:///data0/magnus/mysql/trunk-cluster/ based on revid:magnus.blaudd@stripped

 3313 magnus.blaudd@stripped	2011-06-08
      ndb
       - remove subtraction of extra_length from key_length, since key_length
         no longer includes null bytes etc.

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-05-20 11:50:50 +0000
+++ b/sql/ha_ndbcluster.cc	2011-06-08 11:25:40 +0000
@@ -11116,14 +11116,11 @@ ha_ndbcluster::records_in_range(uint inx
       else
       {
         // Has an equality range on a leading part of 'key_length':
-        // - Null indicator, and HA_KEY_BLOB_LENGTH bytes in
-        //   'extra_length' are removed from key_fraction calculations.
         // - Assume reduced selectivity for non-unique indexes
         //   by decreasing 'eq_fraction' by 20%
         // - Assume equal selectivity for all eq_parts in key.
 
-        double eq_fraction = (double)(eq_bound_len) / 
-                                     (key_length - key_info->extra_length);
+        double eq_fraction = (double)(eq_bound_len) / key_length;
         if (idx_type == ORDERED_INDEX) // Non-unique index -> less selectivity
           eq_fraction/= 1.20;
         if (eq_fraction >= 1.0)        // Exact match -> 1 row


--===============6629805694708024017==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   hudbq0j7ixb3x0lv
# target_branch: file:///data0/magnus/mysql/trunk-cluster/
# testament_sha1: 2a6fd6514aaad2940da8c774b17eab71759131b3
# timestamp: 2011-06-08 13:27:07 +0200
# source_branch: file:///data0/magnus/mysql/5.5-cluster/
# base_revision_id: magnus.blaudd@stripped\
#   mkf3q1eflql34i56
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRo/X7AAAYdfgEQQUGf//1IA
AAC///9wUAOjekupvewe72rhoUyjamGkm2pPxQ9SMT0mmyJsiBJJNT0myNKemQQyegjJkaAASiND
UAmp5MSjeU0gbSADTBtUjFBhqBoD1AAAAASRTU2gQ9U8TUxT8gaKbRNMQeopCmw9zvyHsvVPz4IH
aVtEDBOYHzGiQ0kgPdRNodxqMzLDoWKpzKo2ixSTZ8OmPVO3p+GS/F290Ka51XGLtCDd8Ri7577y
QyDZHGyrWqgOBCMIisEySAMkNu2hYiRCJNRDAseOXWQaqnHQTsEYMgDedwxMGCkYCeMDyFIdQUW/
gvAnLBcfeYRvMOUxSIYihjITXsHKjwkfpUSXji9vDJiON6WVieEztuxVh01K9m57Aw/qL9DRRD3h
HWuF6iaLHo0QeRtgfVomNm7rCbFZDMc2hittNP+IUm+5gsFZSWtPSKy4qVicYjFzGREr4Yz6jGiY
1tgSrrK97hmSCgGCPnsrFgG+4SGplxzM7YEsaYERNYWjlM722QUUJGfc73Puo52ZDTXWnQaQ4/hb
T3qZqmFaY07FdWqbOwmTjhHMuGrlm9ZUkzaddRbdDS5ZKgtIEGiizWJQJ0XTl1M27GTeeC2dXJDz
Kwx+O3lNVCIdNTDLhOBpHBPNhookcYLlRtehVUQJPD0SPG6b7YogvBIxvLugraPtd0IqJ3SO54gL
1m5cEUK7mYg1BUsKW85MyQ/3OTwVLlGMIuvTVKceb1JXcQBSqZhBFhMBTtkiMcmXyD+yEC/r5UhB
y422HJGMAtdm+q3qffWd3dYGy1v5bO5yi1DE6Zbut+xbGwblk8MdJRUGhP7FygaMrztbOF5Dcczc
Qj2HOA0i3xlbqDnlMdfR+hNmjRpdIcLdyzZsQ+O5T7jikorWEsiyfyTT8SSct1NiFnTZKaJEPY6h
z4ih29Bbbmn1pguC8j1wBgqCaYOQLi1SQ5QjL1ubTtCqhEhdkjAPg4jOWqzRG8ys3CXXJ3KqpklD
CM1Q5U7kmy0Cub8ztZNB1HNBSlGCFZ7LqQ9HCpq/AsqVk2yFvUslFKZEoUNDMnmW+WD8kRaglnN5
ZeGJLJ3MLNakXucFb7oIv4ieBLv/BUmPlbdO96S4IJE0RByWTYJSq/YIUTp12tTUVhEIthd5DnXl
uVzlY3Go7d4c4590zgRCas1wlOCa+4yrKtewlyIcqnpW7IhIOSoSWKZhM6iXCnICgmUiTlk4//F3
JFOFCQGj9fsA


--===============6629805694708024017==--