bk commit into 5.1 tree (tomas:1.2638)

[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-10-14 12:24:53+02:00, tomas@stripped +3 -0
  wl#4080
  - add custom data field to ndb operation record

  storage/ndb/include/ndbapi/NdbOperation.hpp@stripped, 2007-10-14 12:24:50+02:00, tomas@stripped +5 -0
    wl#4080
    - add custom data field to ndb operation record

  storage/ndb/src/ndbapi/NdbOperation.cpp@stripped, 2007-10-14 12:24:50+02:00, tomas@stripped +2 -0
    wl#4080
    - add custom data field to ndb operation record

  storage/ndb/src/ndbapi/NdbOperationDefine.cpp@stripped, 2007-10-14 12:24:50+02:00, tomas@stripped +2 -2
    wl#4080
    - add custom data field to ndb operation record

diff -Nrup a/storage/ndb/include/ndbapi/NdbOperation.hpp b/storage/ndb/include/ndbapi/NdbOperation.hpp
--- a/storage/ndb/include/ndbapi/NdbOperation.hpp	2007-10-12 10:17:30 +02:00
+++ b/storage/ndb/include/ndbapi/NdbOperation.hpp	2007-10-14 12:24:50 +02:00
@@ -860,6 +860,11 @@ public:
   NdbTransaction* getNdbTransaction();
   const NdbOperation* next() const;
   const NdbRecAttr* getFirstRecAttr() const;
+
+  void* getCustomData() const { return m_customData; }
+  void setCustomData(void* p) { m_customData = p; }
+protected:
+  void* m_customData;
 #endif
 protected:
 
diff -Nrup a/storage/ndb/src/ndbapi/NdbOperation.cpp b/storage/ndb/src/ndbapi/NdbOperation.cpp
--- a/storage/ndb/src/ndbapi/NdbOperation.cpp	2007-10-12 09:12:25 +02:00
+++ b/storage/ndb/src/ndbapi/NdbOperation.cpp	2007-10-14 12:24:50 +02:00
@@ -81,6 +81,7 @@ NdbOperation::NdbOperation(Ndb* aNdb, Nd
 {
   theReceiver.init(NdbReceiver::NDB_OPERATION, false, this);
   theError.code = 0;
+  m_customData = NULL;
 }
 /*****************************************************************************
  * ~NdbOperation();
@@ -190,6 +191,7 @@ NdbOperation::init(const NdbTableImpl* t
     // theReceiver sets the error code of its owner
     return -1;
   }
+  m_customData = NULL;
   return 0;
 }
 
diff -Nrup a/storage/ndb/src/ndbapi/NdbOperationDefine.cpp b/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
--- a/storage/ndb/src/ndbapi/NdbOperationDefine.cpp	2007-07-02 18:26:39 +02:00
+++ b/storage/ndb/src/ndbapi/NdbOperationDefine.cpp	2007-10-14 12:24:50 +02:00
@@ -468,8 +468,8 @@ NdbOperation::setValue( const NdbColumnI
 {
   DBUG_ENTER("NdbOperation::setValue");
   DBUG_PRINT("enter", ("col: %s  op:%d  val: 0x%lx",
-                       tAttrInfo->m_name.c_str(), theOperationType,
-                       (long) aValuePassed));
+                       tAttrInfo ? tAttrInfo->m_name.c_str() : "NULL",
+                       theOperationType, (long) aValuePassed));
 
   int tReturnCode;
   Uint32 tAttrId;