bk commit into 5.1 tree (tomas:1.2825) BUG#32760

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas.  When tomas does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-08 15:57:44+01:00, tomas@stripped +1 -0
  Bug#32760 - correction of merge error with CGE 6.3

  sql/ha_ndbcluster.cc@stripped, 2008-01-08 15:57:41+01:00, tomas@stripped +12 -10
    Bug#32760 - correction of merge error with CGE 6.3

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2007-12-18 07:32:28 +01:00
+++ b/sql/ha_ndbcluster.cc	2008-01-08 15:57:41 +01:00
@@ -5606,6 +5606,17 @@ static int ndbcluster_update_apply_statu
 }
 #endif /* HAVE_NDB_BINLOG */
 
+static void transaction_checks(THD *thd, Thd_ndb *thd_ndb)
+{
+  if (thd->lex->sql_command == SQLCOM_LOAD)
+    thd_ndb->trans_options|= TNTO_TRANSACTIONS_OFF;
+  else if (!thd->transaction.on)
+    thd_ndb->trans_options|= TNTO_TRANSACTIONS_OFF;
+  else if (!thd->variables.ndb_use_transactions)
+    thd_ndb->trans_options|= TNTO_TRANSACTIONS_OFF;
+  thd_ndb->m_force_send= thd->variables.ndb_force_send;
+}
+
 int ha_ndbcluster::start_statement(THD *thd,
                                    Thd_ndb *thd_ndb,
                                    uint table_count)
@@ -5615,6 +5626,7 @@ int ha_ndbcluster::start_statement(THD *
   DBUG_ENTER("ha_ndbcluster::start_statement");
 
   m_thd_ndb= thd_ndb;
+  transaction_checks(thd, m_thd_ndb);
 
   if (table_count == 0)
   {
@@ -5917,16 +5929,6 @@ int ha_ndbcluster::start_stmt(THD *thd, 
 error:
   thd_ndb->start_stmt_count--;
   DBUG_RETURN(error);
-}
-
-static void transaction_checks(THD *thd, Thd_ndb *thd_ndb)
-{
-  if (thd->lex->sql_command == SQLCOM_LOAD ||
-      !thd->transaction.on)
-    thd_ndb->trans_options|= TNTO_TRANSACTIONS_OFF;
-  else if (!thd->variables.ndb_use_transactions)
-    thd_ndb->trans_options|= TNTO_TRANSACTIONS_OFF;
-  thd_ndb->m_force_send= thd->variables.ndb_force_send;
 }
 
 NdbTransaction *