diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-09-12 16:08:59 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-09-12 16:08:59 +0200 |
| commit | 45433e7813d19e5e4cd2919c0a244370406eecca (patch) | |
| tree | 4b5e4791775bf1ea40e7ec166f949fd40e27ccfc /ndb/include | |
| parent | 0a3202bedfbe3666e29690b12ce94123e73f8945 (diff) | |
| parent | c1c2a8920cc5939715e43b615dbb2be22f09c9d3 (diff) | |
| download | mariadb-git-45433e7813d19e5e4cd2919c0a244370406eecca.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/kernel/GlobalSignalNumbers.h | 2 | ||||
| -rw-r--r-- | ndb/include/kernel/signaldata/EventReport.hpp | 6 | ||||
| -rw-r--r-- | ndb/include/kernel/signaldata/StopReq.hpp | 10 |
3 files changed, 13 insertions, 5 deletions
diff --git a/ndb/include/kernel/GlobalSignalNumbers.h b/ndb/include/kernel/GlobalSignalNumbers.h index ff3690d60a5..a4a0bafb6ec 100644 --- a/ndb/include/kernel/GlobalSignalNumbers.h +++ b/ndb/include/kernel/GlobalSignalNumbers.h @@ -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 @@ -900,6 +899,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 diff --git a/ndb/include/kernel/signaldata/EventReport.hpp b/ndb/include/kernel/signaldata/EventReport.hpp index 1ad6e1bf7ac..67595648f34 100644 --- a/ndb/include/kernel/signaldata/EventReport.hpp +++ b/ndb/include/kernel/signaldata/EventReport.hpp @@ -133,9 +133,9 @@ public: CreateLogBytes = 48, InfoEvent = 49, - //GREP - GrepSubscriptionInfo = 52, - GrepSubscriptionAlert = 53, + // SINGLE USER + SingleUser = 52, + /* unused 53 */ //BACKUP BackupStarted = 54, diff --git a/ndb/include/kernel/signaldata/StopReq.hpp b/ndb/include/kernel/signaldata/StopReq.hpp index ea453ae115d..8e6a0b90a91 100644 --- a/ndb/include/kernel/signaldata/StopReq.hpp +++ b/ndb/include/kernel/signaldata/StopReq.hpp @@ -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: |