bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3885 to 3886)

[magnus.blaudd]

 3886 magnus.blaudd@stripped	2012-04-13 [merge]
      Merge 7.1 -> 7.2

    modified:
      sql/ha_ndbcluster.cc
 3885 magnus.blaudd@stripped	2012-04-13
      Bug#13947227 "TRANSACTION_ALLOW_BATCHING" VARIABLE NOT FOUND IN THE CLUSTER
      7.2
       - The variable was unfortunately lost when rebasing to 5.5
       - Readd variable, add sys_vars test and enable the ndb_sql_allow_batching 

    added:
      mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result
      mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test
    modified:
      mysql-test/suite/ndb/t/disabled.def
      sql/sys_vars.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2012-03-30 12:25:43 +0000
+++ b/sql/ha_ndbcluster.cc	2012-04-13 09:50:47 +0000
@@ -4445,11 +4445,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).