From: Ole John Aske
Date: September 28 2011 6:57am
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3566 to 3567)
List-Archive: http://lists.mysql.com/commits/141173
Message-Id: <20110928065750.E792B230@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3567 Ole John Aske	2011-09-28
      Fixed windows compiler warnings

    modified:
      sql/abstract_query_plan.cc
 3566 Ole John Aske	2011-09-27
      Optimization of how parent operations are choosen in SPJ queries.
      
      Patch introduce usage of fanout-statistics in optimization of
      how we select 'parent relations' for scan childs. 

    modified:
      sql/abstract_query_plan.cc
      sql/abstract_query_plan.h
      sql/ha_ndbcluster_push.cc
      sql/ha_ndbcluster_push.h
=== modified file 'sql/abstract_query_plan.cc'
--- a/sql/abstract_query_plan.cc	2011-09-27 13:33:51 +0000
+++ b/sql/abstract_query_plan.cc	2011-09-28 06:57:21 +0000
@@ -281,7 +281,7 @@ namespace AQP
 
       case AT_TABLE_SCAN:
         DBUG_ASSERT(get_join_tab()->table->file->stats.records>0.0);
-        return get_join_tab()->table->file->stats.records;
+        return static_cast<double>(get_join_tab()->table->file->stats.records);
 
       default:
         return 99999999.0;

No bundle (reason: useless for push emails).