MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tomas Date:July 11 2007 1:53pm
Subject:bk commit into 5.1 tree (tomas:1.2575)
View as plain text  
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-07-11 15:53:01+02:00, tomas@stripped +1 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-6.2
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-wl3627-new2
  MERGE: 1.2572.1.4

  sql/ha_ndbcluster.cc@stripped, 2007-07-11 15:52:57+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.478.1.1

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl3627-new2/RESYNC

--- 1.479/sql/ha_ndbcluster.cc	2007-07-06 22:30:41 +02:00
+++ 1.480/sql/ha_ndbcluster.cc	2007-07-11 15:52:57 +02:00
@@ -5149,7 +5149,7 @@
   }
 #endif /* HAVE_NDB_BINLOG */
 
-  if (thd->options & OPTION_ALLOW_BATCH)
+  if (thd->slave_thread)
   {
     if ((res= trans->execute(Commit, AO_IgnoreError, 1)) != 0)
     {
Thread
bk commit into 5.1 tree (tomas:1.2575)tomas11 Jul