Commit 374dd037 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  merge
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  merge
parents 2740651e 8354e066

ndb/src/ndbapi/NdbImpl.hpp

+6 −4
Original line number Diff line number Diff line
@@ -89,11 +89,9 @@ public: 
  /**

   * NOTE free lists must be _after_ theNdbObjectIdMap take

   *   assure that destructors are run in correct order

   * NOTE these has to be in this specific order to make destructor run in

   *      correct order

   */

  Ndb_free_list_t<NdbTransaction> theConIdleList; 

  Ndb_free_list_t<NdbOperation>  theOpIdleList;  

  Ndb_free_list_t<NdbIndexScanOperation> theScanOpIdleList;

  Ndb_free_list_t<NdbIndexOperation> theIndexOpIdleList;

  Ndb_free_list_t<NdbRecAttr> theRecAttrIdleList;  

  Ndb_free_list_t<NdbApiSignal> theSignalIdleList;

  Ndb_free_list_t<NdbLabel> theLabelList;
@@ -102,6 +100,10 @@ public: 
  Ndb_free_list_t<NdbCall> theCallList;

  Ndb_free_list_t<NdbBlob> theNdbBlobIdleList;

  Ndb_free_list_t<NdbReceiver> theScanList;

  Ndb_free_list_t<NdbIndexScanOperation> theScanOpIdleList;

  Ndb_free_list_t<NdbOperation>  theOpIdleList;  

  Ndb_free_list_t<NdbIndexOperation> theIndexOpIdleList;

  Ndb_free_list_t<NdbTransaction> theConIdleList; 

};



#ifdef VM_TRACE

ndb/src/ndbapi/NdbRecAttr.cpp

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


NdbRecAttr::NdbRecAttr(Ndb*)

{

  theStorageX = 0;

  init();

}
@@ -53,6 +54,9 @@ NdbRecAttr::setup(const NdbColumnImpl* anAttrInfo, char* aValue) 
  theNULLind = 0;

  m_nullable = anAttrInfo->m_nullable;



  if (theStorageX)

    delete[] theStorageX;



  // check alignment to signal data

  // a future version could check alignment per data type as well