Commit 130e902c 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/include/ndbapi/NdbBlob.hpp:
  Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/ndbapi/bank/BankLoad.cpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbRestarts.cpp:
  Auto merged
ndb/tools/restore/Restore.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
ndb/include/ndbapi/Ndb.hpp:
  merge
ndb/include/ndbapi/NdbIndexOperation.hpp:
  merge
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  merge
ndb/include/ndbapi/NdbTransaction.hpp:
  merge
ndb/src/ndbapi/NdbImpl.hpp:
  merge
ndb/src/ndbapi/Ndblist.cpp:
  merge
ndb/test/src/HugoCalculator.cpp:
  merge
ndb/test/src/NDBT_Test.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
sql/mysqld.cc:
  merge
sql/sql_lex.h:
  merge
sql/sql_parse.cc:
  merge
parents 8e2d318b b390a1a4

ndb/include/ndbapi/Ndb.hpp

+13 −15
Original line number Diff line number Diff line
@@ -984,10 +984,10 @@ class BaseString; 
class NdbEventOperation;

class NdbBlob;

class NdbReceiver;

template <class T> struct Ndb_free_list_t;



typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*);





#if defined NDB_OSE

/**

 * Default time to wait for response after request has been sent to
@@ -1457,8 +1457,20 @@ public: 
   */

  NdbTransaction* hupp( NdbTransaction* );

  Uint32 getReference() const { return theMyRef;}



  struct Free_list_usage

  {

    const char * m_name;

    Uint32 m_created;

    Uint32 m_free;

    Uint32 m_sizeof;

  };



  Free_list_usage * get_free_list_usage(Free_list_usage*);

#endif



  



/*****************************************************************************

 *	These are service routines used by the other classes in the NDBAPI.

 ****************************************************************************/
@@ -1630,22 +1642,8 @@ private: 
  class NdbDictionaryImpl* theDictionary;

  class NdbGlobalEventBufferHandle* theGlobalEventBufferHandle;



  NdbTransaction*	theConIdleList;	// First connection in idle list.



  NdbOperation*		theOpIdleList;	// First operation in the idle list. 



  NdbIndexScanOperation* theScanOpIdleList;	// First scan operation in the idle list. 

  NdbIndexOperation*	theIndexOpIdleList;	// First index operation in the idle list. 

  NdbTransaction*	theTransactionList;

  NdbTransaction**      theConnectionArray;

  NdbRecAttr*		theRecAttrIdleList;  

  NdbApiSignal*		theSignalIdleList;   // First signal in idlelist.

  NdbLabel*		theLabelList;	     // First label descriptor in list

  NdbBranch*		theBranchList;	     // First branch descriptor in list

  NdbSubroutine*	theSubroutineList;   // First subroutine descriptor in

  NdbCall*		theCallList;	     // First call descriptor in list

  NdbReceiver*          theScanList;

  NdbBlob*              theNdbBlobIdleList;



  Uint32   theMyRef;        // My block reference  

  Uint32   theNode;         // The node number of our node

ndb/include/ndbapi/NdbBlob.hpp

+5 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ private: 
  // for keeping in lists

  NdbBlob* theNext;

  // initialization

  NdbBlob();

  NdbBlob(Ndb*);

  void init();

  void release();

  // classify operations
@@ -329,6 +329,10 @@ private: 
  int getOperationType() const;

  friend class NdbOut& operator<<(NdbOut&, const NdbBlob&);

#endif



  void next(NdbBlob* obj) { theNext= obj;}

  NdbBlob* next() { return theNext;}

  friend struct Ndb_free_list_t<NdbBlob>;

};



#endif

ndb/include/ndbapi/NdbIndexOperation.hpp

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ private: 


  // Private attributes

  const NdbIndexImpl* m_theIndex;

  friend struct Ndb_free_list_t<NdbIndexOperation>;

};



#endif

ndb/include/ndbapi/NdbIndexScanOperation.hpp

+2 −1
Original line number Diff line number Diff line
@@ -165,9 +165,10 @@ private: 
  int compare(Uint32 key, Uint32 cols, const NdbReceiver*, const NdbReceiver*);



  Uint32 m_sort_columns;

  

  Uint32 m_this_bound_start;

  Uint32 * m_first_bound_word;



  friend struct Ndb_free_list_t<NdbIndexScanOperation>;

};



#endif

ndb/include/ndbapi/NdbOperation.hpp

+5 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "NdbError.hpp"

#include "NdbReceiver.hpp"

#include "NdbDictionary.hpp"

#include "Ndb.hpp"



class Ndb;

class NdbApiSignal;
@@ -756,8 +757,6 @@ protected: 
/******************************************************************************

 * These are the methods used to create and delete the NdbOperation objects.

 *****************************************************************************/

  			NdbOperation(Ndb* aNdb);	

  			virtual ~NdbOperation();



  bool                  needReply();

/******************************************************************************
@@ -769,6 +768,8 @@ protected: 
  int init(const class NdbTableImpl*, NdbTransaction* aCon);

  void initInterpreter();



  NdbOperation(Ndb* aNdb);	

  virtual ~NdbOperation();

  void	next(NdbOperation*);		// Set next pointer		      

  NdbOperation*	    next();	        // Get next pointer		       

public:
@@ -965,6 +966,8 @@ protected: 
   * IgnoreError on connection level.

   */

  Int8 m_abortOption;



  friend struct Ndb_free_list_t<NdbOperation>;

};



#ifdef NDB_NO_DROPPED_SIGNAL