bzr push into mysql-trunk branch (magnus.blaudd:3944 to 3945)

[magnus.blaudd]

 3945 magnus.blaudd@stripped	2012-06-01 [merge]
      Merge

    modified:
      sql/ha_ndbcluster.cc
 3944 Annamalai Gurusami	2012-06-01 [merge]
      Null merge from mysql-5.5 to mysql-trunk. 

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2012-05-22 09:03:56 +0000
+++ b/sql/ha_ndbcluster.cc	2012-06-01 11:03:09 +0000
@@ -7530,7 +7530,7 @@ static void transaction_checks(THD *thd,
 {
   if (thd->lex->sql_command == SQLCOM_LOAD)
     thd_ndb->trans_options|= TNTO_TRANSACTIONS_OFF;
-  else if (!thd->transaction.on)
+  else if (!thd->transaction.flags.enabled)
     thd_ndb->trans_options|= TNTO_TRANSACTIONS_OFF;
   else if (!THDVAR(thd, use_transactions))
     thd_ndb->trans_options|= TNTO_TRANSACTIONS_OFF;

No bundle (reason: useless for push emails).