Commit a4ae151c authored by unknown's avatar unknown
Browse files

Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  SCCS merged
parents b50b782d 9f9314b5

storage/ndb/include/kernel/GlobalSignalNumbers.h

+5 −5
Original line number Diff line number Diff line
@@ -551,13 +551,13 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_ABORT_ALL_REF               446

#define GSN_ABORT_ALL_CONF              447



#define GSN_STATISTICS_REQ              448

/* 448 unused - formerly GSN_STATISTICS_REQ */

#define GSN_STOP_ORD                    449

#define GSN_TAMPER_ORD                  450

#define GSN_SET_VAR_REQ                 451

#define GSN_SET_VAR_CONF                452

#define GSN_SET_VAR_REF                 453

#define GSN_STATISTICS_CONF             454

/* 451 unused - formerly GSN_SET_VAR_REQ  */

/* 452 unused - formerly GSN_SET_VAR_CONF */

/* 453 unused - formerly GSN_SET_VAR_REF  */

/* 454 unused - formerly GSN_STATISTICS_CONF */



#define GSN_START_ORD                   455

/* 457 unused */

storage/ndb/include/mgmapi/mgmapi.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "ndb_logevent.h"



#define MGM_LOGLEVELS CFG_MAX_LOGLEVEL - CFG_MIN_LOGLEVEL + 1

#define NDB_MGM_MAX_LOGLEVEL 15



/**

 * @mainpage MySQL Cluster Management API

storage/ndb/include/util/OutputStream.hpp

+2 −2
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ public: 


class SocketOutputStream : public OutputStream {

  NDB_SOCKET_TYPE m_socket;

  unsigned m_timeout;

  unsigned m_timeout_ms;

public:

  SocketOutputStream(NDB_SOCKET_TYPE socket, unsigned writeTimeout = 1000);

  SocketOutputStream(NDB_SOCKET_TYPE socket, unsigned write_timeout_ms = 1000);

  virtual ~SocketOutputStream() {}



  int print(const char * fmt, ...);

storage/ndb/src/common/debugger/signaldata/SignalNames.cpp

+1 −6
Original line number Diff line number Diff line
@@ -350,14 +350,9 @@ const GsnName SignalNames [] = { 
  ,{ GSN_TUP_WRITELOG_REQ,       "TUP_WRITELOG_REQ" }

  ,{ GSN_LQH_WRITELOG_REQ,       "LQH_WRITELOG_REQ" }



  ,{ GSN_STATISTICS_REQ,         "STATISTICS_REQ" }

  ,{ GSN_START_ORD,              "START_ORD" }

  ,{ GSN_STOP_ORD,               "STOP_ORD" }

  ,{ GSN_TAMPER_ORD,             "TAMPER_ORD" }

  ,{ GSN_SET_VAR_REQ,            "SET_VAR_REQ" }

  ,{ GSN_SET_VAR_CONF,           "SET_VAR_CONF" }

  ,{ GSN_SET_VAR_REF,            "SET_VAR_REF" }

  ,{ GSN_STATISTICS_CONF,        "STATISTICS_CONF" }



  ,{ GSN_EVENT_SUBSCRIBE_REQ,    "EVENT_SUBSCRIBE_REQ" }

  ,{ GSN_EVENT_SUBSCRIBE_CONF,   "EVENT_SUBSCRIBE_CONF" }

storage/ndb/src/common/util/OutputStream.cpp

+4 −4
Original line number Diff line number Diff line
@@ -42,16 +42,16 @@ FileOutputStream::println(const char * fmt, ...){ 
}



SocketOutputStream::SocketOutputStream(NDB_SOCKET_TYPE socket,

				       unsigned timeout){

				       unsigned write_timeout_ms){

  m_socket = socket;

  m_timeout = timeout;

  m_timeout_ms = write_timeout_ms;

}



int

SocketOutputStream::print(const char * fmt, ...){

  va_list ap;

  va_start(ap, fmt);

  const int ret = vprint_socket(m_socket, m_timeout, fmt, ap);

  const int ret = vprint_socket(m_socket, m_timeout_ms, fmt, ap);

  va_end(ap);

  return ret;

}
@@ -59,7 +59,7 @@ int 
SocketOutputStream::println(const char * fmt, ...){

  va_list ap;

  va_start(ap, fmt);

  const int ret = vprintln_socket(m_socket, m_timeout, fmt, ap);

  const int ret = vprintln_socket(m_socket, m_timeout_ms, fmt, ap);

  va_end(ap);

  return ret;

}