mirror of
https://github.com/MariaDB/server.git
synced 2025-09-05 08:04:25 +03:00
Merge 4.1 with jonas irix clone
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user