Commit 086a2eb1 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
parents 82a6a858 3ab332c4

storage/ndb/include/debugger/EventLogger.hpp

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ private: 
  Uint32 m_filterLevel;



  STATIC_CONST(MAX_TEXT_LENGTH = 256);

  char m_text[MAX_TEXT_LENGTH];

};

storage/ndb/include/logger/FileLogHandler.hpp

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ private: 
  bool setMaxFiles(const BaseString &files);

  

  int m_maxNoFiles;

  long m_maxFileSize;

  off_t m_maxFileSize;

  unsigned int m_maxLogEntries;

  File_class* m_pLogFile;

};

storage/ndb/include/logger/Logger.hpp

+4 −2
Original line number Diff line number Diff line
@@ -155,8 +155,6 @@ public: 
  /**

   * Create a default handler that logs to the syslog.

   *

   * On OSE a ConsoleHandler will be created since there is no syslog support.

   *

   * @return true if successful.

   */

  bool createSyslogHandler();
@@ -276,6 +274,8 @@ public: 


protected:



  NdbMutex *m_mutex;



  void log(LoggerLevel logLevel, const char* msg, va_list ap) const;



private:
@@ -290,7 +290,9 @@ private: 
  

  LogHandlerList* m_pHandlerList;

  const char* m_pCategory;



  /* Default handlers */

  NdbMutex *m_handler_mutex;

  LogHandler* m_pConsoleHandler;

  LogHandler* m_pFileHandler;

  LogHandler* m_pSyslogHandler;

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

+4 −4
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ 
#define CFG_SCI_SEND_LIMIT            554

#define CFG_SCI_BUFFER_MEM            555



#define CFG_OSE_PRIO_A_SIZE           602

#define CFG_OSE_PRIO_B_SIZE           603

#define CFG_OSE_RECEIVE_ARRAY_SIZE    604

#define CFG_602                       602 // Removed: was OSE

#define CFG_603                       603 // Removed: was OSE

#define CFG_604                       604 // Removed: was OSE



/**

 * API Config variables
@@ -178,6 +178,6 @@ 
#define CONNECTION_TYPE_TCP           0

#define CONNECTION_TYPE_SHM           1

#define CONNECTION_TYPE_SCI           2

#define CONNECTION_TYPE_OSE           3

#define CONNECTION_TYPE_OSE           3 // Removed.



#endif

storage/ndb/include/ndbapi/Ndb.hpp

+1 −11
Original line number Diff line number Diff line
@@ -501,12 +501,11 @@ 
  

   There are four conditions leading to the transfer of database 

   operations from Ndb object buffers to the NDB kernel:

   -# The NDB Transporter (TCP/IP, OSE, SCI or shared memory)

   -# The NDB Transporter (TCP/IP, SCI or shared memory)

      decides that a buffer is full and sends it off. 

      The buffer size is implementation-dependent and

      may change between MySQL Cluster releases.

      On TCP/IP the buffer size is usually around 64 KB;

      on OSE/Delta it is usually less than 2000 bytes. 

      Since each Ndb object provides a single buffer per storage node, 

      the notion of a "full" buffer is local to this storage node.

   -# The accumulation of statistical data on transferred information
@@ -991,16 +990,7 @@ 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 

 * NDB Cluster (Set to 10 seconds usually, but to 100 s in 

 * the OSE operating system)

 */

#define WAITFOR_RESPONSE_TIMEOUT 100000 // Milliseconds

#else

#define WAITFOR_RESPONSE_TIMEOUT 120000 // Milliseconds

#endif



#define NDB_SYSTEM_DATABASE "sys"

#define NDB_SYSTEM_SCHEMA "def"