bzr push into mysql-trunk-cluster branch (ole.john.aske:3491 to 3492)

[Ole John Aske]

 3492 Ole John Aske	2012-05-04 [merge]
      Merge cluster-7.3 -> trunk-cluster

    modified:
      sql/ha_ndbcluster.cc
 3491 Ole John Aske	2012-05-03 [merge]
      Merge mysql-5.5-cluster-7.3 -> mysql-trunk-cluster.

    modified:
      mysql-test/suite/ndb/r/ndb_blob.result
      mysql-test/suite/ndb/r/ndb_dd_sql_features.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_none.result
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_push.cc
      sql/handler.h
      sql/sql_executor.cc
      sql/sql_optimizer.cc
      sql/sql_select.cc
      storage/ndb/memcache/src/ndb_engine.c
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2012-05-03 13:54:29 +0000
+++ b/sql/ha_ndbcluster.cc	2012-05-04 08:21:42 +0000
@@ -12376,16 +12376,11 @@ ulonglong ha_ndbcluster::table_flags(voi
     f= (f | HA_BINLOG_STMT_CAPABLE) & ~HA_HAS_OWN_BINLOGGING;
 
   /**
-   * To maximize join pushability we want const-table optimization
-   * blocked if table is possibly pushable, that is:
-   *  - Variable 'ndb_join_pushdown= on'
-   *  - Lock mode is LM_CommittedRead
+   * To maximize join pushability we want const-table 
+   * optimization blocked if 'ndb_join_pushdown= on'
    */
-  if (THDVAR(thd, join_pushdown) &&
-      get_ndb_lock_mode(m_lock.type) == NdbOperation::LM_CommittedRead)
-  {
+  if (THDVAR(thd, join_pushdown))
     f= f | HA_BLOCK_CONST_TABLE;
-  }
 
   return f;
 }

No bundle (reason: useless for push emails).