bzr push into mysql-5.1-telco-7.1 branch (jonas:3858 to 3859)

[Jonas Oreland]

 3859 Jonas Oreland	2010-10-02 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/ndbapi/NdbApiSignal.cpp
 3858 Jonas Oreland	2010-10-01 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/include/kernel/BlockNumbers.h
      storage/ndb/src/ndbapi/ClusterMgr.cpp
      storage/ndb/src/ndbapi/ClusterMgr.hpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
=== modified file 'storage/ndb/src/ndbapi/NdbApiSignal.cpp'
--- a/storage/ndb/src/ndbapi/NdbApiSignal.cpp	2010-09-29 13:25:19 +0000
+++ b/storage/ndb/src/ndbapi/NdbApiSignal.cpp	2010-10-01 18:49:35 +0000
@@ -278,6 +278,7 @@ NdbApiSignal::set(Uint8  trace,
 
 void
 NdbApiSignal::copyFrom(const NdbApiSignal * src){
+  theSignalId             = src->theSignalId;
   theVerId_signalNumber   = src->theVerId_signalNumber;
   theReceiversBlockNumber = src->theReceiversBlockNumber;
   theSendersBlockRef      = src->theSendersBlockRef;
@@ -292,11 +293,4 @@ NdbApiSignal::copyFrom(const NdbApiSigna
     dstData[i] = srcData[i];
 
   setDataPtr(dstData);
-  
-  /**
-   * NOTE that theSignalId is used as data ptr
-   *   and should not be copied
-   * NOTE that theSendersSignalId is used as next pointer
-   *   and should not be copied
-   */
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]