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

 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
 3444 Ole John Aske	2011-02-28 [merge]
      merge from 'mysql-5.1-telc0-7.0' to SPJ branch
     @ mysql-test/suite/ndb/r/ndb_join_pushdown.result
        Lots of expected result changed as result of merge of 'Bug#11804277' (Heuristic statistics added to ::records_in_range)

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/r/ndb_index.result
      mysql-test/suite/ndb/r/ndb_index_unique.result
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/r/ndb_statistics.result
      mysql-test/suite/ndb/t/ndb_statistics.test
      sql/ha_ndbcluster.cc
      storage/ndb/include/kernel/signaldata/TcIndx.hpp
      storage/ndb/include/ndbapi/NdbTransaction.hpp
      storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
      storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/lgman.cpp
      storage/ndb/src/ndbapi/NdbTransaction.cpp
      storage/ndb/src/ndbapi/Ndbif.cpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
      storage/ndb/src/ndbapi/trp_client.cpp
      storage/ndb/src/ndbapi/trp_client.hpp
=== 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: useless for push emails).