From: Ole John Aske
Date: October 26 2011 7:22am
Subject: bzr push into mysql-trunk-cluster branch (ole.john.aske:3400 to 3401)
List-Archive: http://lists.mysql.com/commits/141580
Message-Id: <20111026072240.9222E233@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3401 Ole John Aske	2011-10-26
      Remove windows compiler warning introduced when 'pushed joins' was 
      intergrated into new MRR interface.

    modified:
      sql/ha_ndbcluster.cc
 3400 Ole John Aske	2011-10-25
      Removed old MRR implementation from ha_ndbcluster (Dead code)

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_glue.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-10-25 08:22:25 +0000
+++ b/sql/ha_ndbcluster.cc	2011-10-26 07:22:10 +0000
@@ -15211,6 +15211,7 @@ int ha_ndbcluster::multi_range_start_ret
             !m_disable_pushed_join &&
             !m_pushed_join_member->get_query_def().isScanQuery())
         {
+          op= NULL;            // Avoid compiler warning
           DBUG_ASSERT(false);  // FIXME: Incomplete code, should not be executed
           DBUG_ASSERT(lm == NdbOperation::LM_CommittedRead);
           const int error= pk_unique_index_read_key_pushed(active_index,

No bundle (reason: useless for push emails).