bk commit into 5.0 tree (aelkin:1.2493) BUG#27395

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of elkin. When elkin 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-03-24 15:30:32+02:00, aelkin@stripped
+1 -0
  Bug #27395  OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() 
  
  fixing wrong written assignment

  sql/ha_ndbcluster.cc@stripped, 2007-03-24 15:30:30+02:00,
aelkin@stripped +1 -1
    fixing assignment

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
# Root:	/home/elkin/MySQL/MAIN/5.0-marvel-bug23333_sf_side_eff_binlog

--- 1.301/sql/ha_ndbcluster.cc	2007-03-23 17:12:55 +02:00
+++ 1.302/sql/ha_ndbcluster.cc	2007-03-24 15:30:30 +02:00
@@ -3636,7 +3636,7 @@ int ha_ndbcluster::external_lock(THD *th
     {
       m_transaction_on= FALSE;
       /* Would be simpler if has_transactions() didn't always say "yes" */
-      thd->no_trans_update= {TRUE, TRUE};
+      thd->no_trans_update.all= thd->no_trans_update.stmt= TRUE;
     }
     else if (!thd->transaction.on)
       m_transaction_on= FALSE;