bk commit into 5.1 tree (tomas:1.2521)

[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-06-08 22:24:06+02:00, tomas@stripped +3 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco
  MERGE: 1.2506.1.23

  storage/ndb/include/ndbapi/NdbOperation.hpp@stripped, 2007-06-08 22:24:02+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.39.5.2

  storage/ndb/src/ndbapi/NdbBlob.cpp@stripped, 2007-06-08 22:24:02+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.55.2.1

  storage/ndb/src/ndbapi/NdbOperation.cpp@stripped, 2007-06-08 22:24:02+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.19.1.4

# 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-telco/RESYNC

--- 1.53/storage/ndb/include/ndbapi/NdbOperation.hpp	2007-05-29 13:46:54 +02:00
+++ 1.54/storage/ndb/include/ndbapi/NdbOperation.hpp	2007-06-08 22:24:02 +02:00
@@ -1204,6 +1204,13 @@
    */
   Int8 m_abortOption;
 
+  /*
+   * For blob impl, option to not propagate error to trans level.
+   * Could be AO_IgnoreError variant if we want it public.
+   * Ignored unless AO_IgnoreError is also set.
+   */
+  Int8 m_noErrorPropagation;
+
   friend struct Ndb_free_list_t<NdbOperation>;
 
   Uint32 repack_read(Uint32 len);

--- 1.25/storage/ndb/src/ndbapi/NdbOperation.cpp	2007-05-29 13:46:54 +02:00
+++ 1.26/storage/ndb/src/ndbapi/NdbOperation.cpp	2007-06-08 22:24:02 +02:00
@@ -76,7 +76,8 @@
   m_keyInfoGSN(GSN_KEYINFO),
   m_attrInfoGSN(GSN_ATTRINFO),
   theBlobList(NULL),
-  m_abortOption(-1)
+  m_abortOption(-1),
+  m_noErrorPropagation(false)
 {
   theReceiver.init(NdbReceiver::NDB_OPERATION, false, this);
   theError.code = 0;
@@ -101,7 +102,8 @@
   theError.code = anErrorCode;
   theNdbCon->theErrorLine = theErrorLine;
   theNdbCon->theErrorOperation = this;
-  theNdbCon->setOperationErrorCode(anErrorCode);
+  if (!(m_abortOption == AO_IgnoreError && m_noErrorPropagation))
+    theNdbCon->setOperationErrorCode(anErrorCode);
 }
 
 /******************************************************************************
@@ -116,6 +118,7 @@
   theError.code = anErrorCode;
   theNdbCon->theErrorLine = theErrorLine;
   theNdbCon->theErrorOperation = this;
+  // ignore m_noErrorPropagation
   theNdbCon->setOperationErrorCodeAbort(anErrorCode);
 }
 
@@ -163,6 +166,7 @@
   m_attribute_record= NULL;
   theBlobList = NULL;
   m_abortOption = -1;
+  m_noErrorPropagation = false;
   m_no_disk_flag = 1;
   m_interpreted_code = NULL;
   m_use_any_value = 0;

--- 1.66/storage/ndb/src/ndbapi/NdbBlob.cpp	2007-05-31 10:17:21 +02:00
+++ 1.67/storage/ndb/src/ndbapi/NdbBlob.cpp	2007-06-08 22:24:02 +02:00
@@ -1794,6 +1794,7 @@
         tOp->setPartitionId(thePartitionId);
       }
       tOp->m_abortOption= NdbOperation::AO_IgnoreError;
+      tOp->m_noErrorPropagation = true;
       n++;
     }
     DBUG_PRINT("info", ("bat=%u", bat));
@@ -2349,6 +2350,7 @@
       }
       if (isWriteOp()) {
         tOp->m_abortOption = NdbOperation::AO_IgnoreError;
+        tOp->m_noErrorPropagation = true;
       }
       theHeadInlineReadOp = tOp;
       // execute immediately
@@ -2395,6 +2397,7 @@
       }
       if (isWriteOp()) {
         tOp->m_abortOption = NdbOperation::AO_IgnoreError;
+        tOp->m_noErrorPropagation = true;
       }
       theHeadInlineReadOp = tOp;
       // execute immediately