bk commit into 5.1 tree (tomas:1.2786) BUG#32670

[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, 2007-12-13 11:28:12+01:00, tomas@stripped +1 -0
  correct merge of bug#32670

  sql/ha_ndbcluster.cc@stripped, 2007-12-13 11:28:09+01:00, tomas@stripped +2
-1
    correct merge of bug#32670

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2007-12-11 15:44:30 +01:00
+++ b/sql/ha_ndbcluster.cc	2007-12-13 11:28:09 +01:00
@@ -5644,6 +5644,8 @@ int ha_ndbcluster::start_statement(THD *
   }
   if (!trans)
   {
+    thd_ndb->trans_options= 0;
+
     DBUG_PRINT("trans",("Possibly starting transaction"));
     DBUG_ASSERT(!table_count || table_count == 1);
     /*
@@ -5678,7 +5680,6 @@ int ha_ndbcluster::start_statement(THD *
 
     thd_ndb->init_open_tables();
     thd_ndb->query_state&= NDB_QUERY_NORMAL;
-    thd_ndb->trans_options= 0;
     thd_ndb->m_slow_path= FALSE;
     if (!(thd->options & OPTION_BIN_LOG) ||
         thd->variables.binlog_format == BINLOG_FORMAT_STMT)