From: Ole John Aske
Date: March 1 2011 8:01am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3445)
List-Archive: http://lists.mysql.com/commits/132171
Message-Id: <20110301080153.D2119223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

 3445 Ole John Aske	2011-03-01 [merge]
      Merge from 'telco' mainline to SPJ branch (Due to fix of Windows build break)

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-02-28 12:25:52 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-01 08:01:47 +0000
@@ -12515,7 +12515,7 @@ ha_ndbcluster::records_in_range(uint inx
         if (eq_fraction >= 1.0)        // Exact match -> 1 row
           DBUG_RETURN(1);
 
-        rows = (Uint64)((double)table_rows / pow(table_rows, eq_fraction));
+        rows = (Uint64)((double)table_rows / pow((double)table_rows, eq_fraction));
         if (rows > (table_rows/50))    // EQ-range: Max 2% of rows
           rows= (table_rows/50);
 

No bundle (reason: revision is a merge).