database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge joreland@bk-internal.mysql.com:irix

Browse Source 
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
This commit is contained in:
unknown
2004-08-05 22:19:52 +02:00
parent 22306d0590 ebe79c0b9b
commit e223c07eb1
93 changed files with 661 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ndb/include/kernel/NodeState.hpp
View File

@ -109,7 +109,8 @@ public:
NodeState(StartLevel);
NodeState(StartLevel, bool systemShutdown);
NodeState(StartLevel, Uint32 startPhase, StartType);
void init();
/**
* Current start level
*/
@ -180,6 +181,12 @@ public:
inline
NodeState::NodeState(){
init();
}
inline
void
NodeState::init(){
startLevel = SL_CMVMI;
nodeGroup = 0xFFFFFFFF;
dynamicId = 0xFFFFFFFF;
@ -190,7 +197,7 @@ NodeState::NodeState(){
inline
NodeState::NodeState(StartLevel sl){
NodeState::NodeState();
init();
startLevel = sl;
singleUserMode = 0;
singleUserApi = 0xFFFFFFFF;
@ -198,7 +205,7 @@ NodeState::NodeState(StartLevel sl){
inline
NodeState::NodeState(StartLevel sl, Uint32 sp, StartType typeOfStart){
NodeState::NodeState();
init();
startLevel = sl;
starting.startPhase = sp;
starting.restartType = typeOfStart;
@ -208,7 +215,7 @@ NodeState::NodeState(StartLevel sl, Uint32 sp, StartType typeOfStart){
inline
NodeState::NodeState(StartLevel sl, bool sys){
NodeState::NodeState();
init();
startLevel = sl;
stopping.systemShutdown = sys;
singleUserMode = 0;

16
ndb/include/kernel/signaldata/SignalData.hpp
View File

@ -21,20 +21,10 @@
#include <ndb_limits.h>
#include <kernel_types.h>
#ifndef NDB_ASSERT
#ifdef VM_TRACE
#define NDB_ASSERT(test, message) { if(!(test)) { printf(message); exit(-1); }}
#else
#define NDB_ASSERT(test, message)
#endif
#endif
// Useful ASSERT macros...
#define ASSERT_BOOL(flag, message) NDB_ASSERT( (flag<=1), (message) )
#define ASSERT_BOOL(flag, message) assert(flag<=1)
#define ASSERT_RANGE(value, min, max, message) \
NDB_ASSERT((value) >= (min) && (value) <= (max), (message))
#define ASSERT_MAX(value, max, message) \
NDB_ASSERT((value) <= (max), (message))
assert((value) >= (min) && (value) <= (max))
#define ASSERT_MAX(value, max, message) assert((value) <= (max))
#define SECTION(x) STATIC_CONST(x)