From: Date: January 19 2007 11:35am
Subject: bk commit into 5.1 tree (tomas:1.2390) BUG#25387
List-Archive: http://lists.mysql.com/commits/18416
X-Bug: 25387
Message-Id: <20070119103513.933B4640B5@poseidon.mysql.com>

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
  1.2390 07/01/19 11:35:00 tomas@stripped +1 -0
  Bug#25387 ndb: dbug assert in reference counting for event operations
  - on blob part execute failure, must leave in state executin, and await dropEventOperation

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.76 07/01/19 11:34:52 tomas@stripped +6 -1
    Bug#25387 ndb: dbug assert in reference counting for event operations
    - on blob part execute failure, must leave in state executin, and await dropEventOperation

# 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:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.75/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-01-17 10:53:34 +01:00
+++ 1.76/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-01-19 11:34:52 +01:00
@@ -571,7 +571,12 @@
       while (blob_op != NULL) {
         r = blob_op->execute_nolock();
         if (r != 0) {
-          break;
+          // since main op is running and possibly some blob ops as well
+          // we can't just reset the main op.  Instead return with error,
+          // main op (and blob ops) will be cleaned up when user calls
+          // dropEventOperation
+          m_error.code= myDict->getNdbError().code;
+          DBUG_RETURN(r);
         }
         // add blob reference to main op
         // removed by TE_STOP or TE_CLUSTER_FAILURE