bk commit into 5.1 tree (jonas:1.2049)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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, 2006-09-27 22:43:51+02:00, jonas@stripped +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/drop5p14d
  into  perch.ndb.mysql.com:/home/jonas/src/drop5p15b
  MERGE: 1.2024.1.3

  configure.in@stripped, 2006-09-27 22:43:49+02:00, jonas@stripped +2 -3
    merge
    MERGE: 1.311.1.3

  sql/ha_ndbcluster.cc@stripped, 2006-09-27 22:42:06+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.245.1.2

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/drop5p15b/RESYNC

--- 1.315/configure.in	2006-09-27 22:43:54 +02:00
+++ 1.316/configure.in	2006-09-27 22:43:54 +02:00
@@ -7,7 +7,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # Don't forget to also update the NDB lines below.
-AM_INIT_AUTOMAKE(mysql, 5.1.2-a_drop5p15)
+AM_INIT_AUTOMAKE(mysql, 5.1.2-a_drop5p15b)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=1
 NDB_VERSION_BUILD=2
-NDB_VERSION_STATUS="a_drop5p15"
+NDB_VERSION_STATUS="a_drop5p15b"
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4

--- 1.249/sql/ha_ndbcluster.cc	2006-09-27 22:43:54 +02:00
+++ 1.250/sql/ha_ndbcluster.cc	2006-09-27 22:43:54 +02:00
@@ -3660,7 +3660,27 @@
                             "stmt" : "all"));
   DBUG_ASSERT(ndb && trans);
 
-  if (execute_commit(thd,trans) != 0)
+  if (thd->options & OPTION_SLAVE_BATCH)
+  {
+    if ((res= trans->execute(Commit, AO_IgnoreError, 1)) != 0)
+    {
+      const NdbError err= trans->getNdbError();
+      if (err.classification == NdbError::ConstraintViolation ||
+	  err.classification == NdbError::NoDataFound)
+      {
+	/*
+	  This is ok...
+	*/
+	res= 0;
+      }
+    }
+  }
+  else
+  {
+    res= execute_commit(thd,trans);
+  }
+
+  if (res != 0)
   {
     const NdbError err= trans->getNdbError();
     const NdbOperation *error_op= trans->getNdbErrorOperation();