bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4524 to 4525)

[magnus.blaudd]

 4525 magnus.blaudd@stripped	2012-04-13 [merge]
      Merge

    modified:
      sql/ha_ndbcluster.cc
 4524 Craig L Russell	2012-04-12
      Clusterj tests -- remove methods not implemented by clusterj mock junit.

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteAllByClassTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ObjectNotFoundTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExplainTest.java
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2012-03-28 14:58:37 +0000
+++ b/sql/ha_ndbcluster.cc	2012-04-13 09:49:27 +0000
@@ -4106,11 +4106,7 @@ bool ha_ndbcluster::isManualBinlogExec(T
 static inline bool
 thd_allow_batch(const THD* thd)
 {
-#ifndef OPTION_ALLOW_BATCH
-  return false;
-#else
   return (thd_options(thd) & OPTION_ALLOW_BATCH);
-#endif
 }
 
 

No bundle (reason: useless for push emails).