Commit 3a806cd6 authored by unknown's avatar unknown
Browse files

Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
parents ec5df5f2 62233c20

ndb/include/kernel/GlobalSignalNumbers.h

+1 −9
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_STATISTICS_CONF             454



#define GSN_START_ORD                   455

/* 456 unused */

/* 457 unused */



#define GSN_EVENT_SUBSCRIBE_REQ         458
@@ -835,14 +834,6 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
/* Start Global Replication */

#define GSN_GREP_REQ                    656



/**

 * Management server

 */

#define GSN_MGM_LOCK_CONFIG_REQ		657

#define GSN_MGM_LOCK_CONFIG_REP		658

#define GSN_MGM_UNLOCK_CONFIG_REQ	659

#define GSN_MGM_UNLOCK_CONFIG_REP	660



#define GSN_UTIL_CREATE_LOCK_REQ        132

#define GSN_UTIL_CREATE_LOCK_REF        133

#define GSN_UTIL_CREATE_LOCK_CONF       188
@@ -900,6 +891,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_RESUME_REQ                  682

#define GSN_STOP_REQ                    443

#define GSN_STOP_REF                    444

#define GSN_STOP_CONF                   456

#define GSN_API_VERSION_REQ             697

#define GSN_API_VERSION_CONF            698

ndb/include/kernel/signaldata/ApiVersion.hpp

+2 −3
Original line number Diff line number Diff line
@@ -49,12 +49,11 @@ class ApiVersionConf { 
   */

  friend class MgmtSrv;  

public:

  STATIC_CONST( SignalLength = 3 );

  STATIC_CONST( SignalLength = 4 );

  Uint32 senderRef; 

  Uint32 nodeId; //api node id

  Uint32 version; // Version of API node



  

  Uint32 inet_addr;

};



#endif

ndb/include/kernel/signaldata/StopReq.hpp

+9 −1
Original line number Diff line number Diff line
@@ -67,6 +67,13 @@ public: 
  static bool getStopAbort(const Uint32 & requestInfo);

};



struct StopConf

{

  STATIC_CONST( SignalLength = 2 );

  Uint32 senderData;

  Uint32 nodeState;

};



class StopRef 

{

  /**
@@ -86,7 +93,8 @@ public: 
    OK = 0,

    NodeShutdownInProgress = 1,

    SystemShutdownInProgress = 2,

    NodeShutdownWouldCauseSystemCrash = 3

    NodeShutdownWouldCauseSystemCrash = 3,

    TransactionAbortFailed = 4

  };

  

public:

ndb/include/mgmapi/ndb_logevent.h

+8 −3
Original line number Diff line number Diff line
@@ -148,9 +148,9 @@ extern "C" { 
    /** NDB_MGM_EVENT_CATEGORY_INFO */

    NDB_LE_InfoEvent = 49,



    /* GREP */

    NDB_LE_GrepSubscriptionInfo = 52,

    NDB_LE_GrepSubscriptionAlert = 53,

    /* SINGLE USER */

    NDB_LE_SingleUser = 52,

    /* NDB_LE_ UNUSED = 53, */



    /** NDB_MGM_EVENT_CATEGORY_BACKUP */

    NDB_LE_BackupStarted = 54,
@@ -593,6 +593,11 @@ extern "C" { 
	unsigned backup_id;

	unsigned error;

      } BackupAborted;

      /** Log event data @ref NDB_LE_SingleUser */

      struct {

        unsigned type;

        unsigned node_id;

      } SingleUser;

#ifndef DOXYGEN_FIX

    };

#else

ndb/src/common/debugger/EventLogger.cpp

+24 −0
Original line number Diff line number Diff line
@@ -633,6 +633,27 @@ void getTextBackupAborted(QQQQ) { 
		       theData[3]);

}



void getTextSingleUser(QQQQ) {

  switch (theData[1])

  {

  case 0:

    BaseString::snprintf(m_text, m_text_len, "Entering single user mode");

    break;

  case 1:

    BaseString::snprintf(m_text, m_text_len,

			 "Entered single user mode "

			 "Node %d has exclusive access", theData[2]);

    break;

  case 2:

    BaseString::snprintf(m_text, m_text_len,"Exiting single user mode");

    break;

  default:

    BaseString::snprintf(m_text, m_text_len,

			 "Unknown single user report %d", theData[1]);

    break;

  }

}



#if 0

BaseString::snprintf(m_text, 

		     m_text_len,
@@ -716,6 +737,9 @@ const EventLoggerBase::EventRepLogLevelMatrix EventLoggerBase::matrix[] = { 
  ROW(CreateLogBytes,          LogLevel::llInfo,  11, Logger::LL_INFO ),

  ROW(InfoEvent,               LogLevel::llInfo,   2, Logger::LL_INFO ),



  //Single User

  ROW(SingleUser,              LogLevel::llInfo,   7, Logger::LL_INFO ),



  // Backup

  ROW(BackupStarted,           LogLevel::llBackup, 7, Logger::LL_INFO ),

  ROW(BackupCompleted,         LogLevel::llBackup, 7, Logger::LL_INFO ),