Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
da64ad06
Commit
da64ad06
authored
Jul 30, 2007
by
lzhou/zhl@dev3-63.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
parents
403c0b35
14e19b1e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
storage/ndb/src/common/debugger/EventLogger.cpp
storage/ndb/src/common/debugger/EventLogger.cpp
+0
-2
storage/ndb/src/mgmclient/CommandInterpreter.cpp
storage/ndb/src/mgmclient/CommandInterpreter.cpp
+10
-2
No files found.
storage/ndb/src/common/debugger/EventLogger.cpp
View file @
da64ad06
...
@@ -90,8 +90,6 @@ void getRestartAction(Uint32 action, BaseString &str)
...
@@ -90,8 +90,6 @@ void getRestartAction(Uint32 action, BaseString &str)
if
(
action
==
0
)
if
(
action
==
0
)
return
;
return
;
str
.
appfmt
(
", restarting"
);
str
.
appfmt
(
", restarting"
);
if
(
action
&
2
)
str
.
appfmt
(
", no start"
);
if
(
action
&
4
)
if
(
action
&
4
)
str
.
appfmt
(
", initial"
);
str
.
appfmt
(
", initial"
);
}
}
...
...
storage/ndb/src/mgmclient/CommandInterpreter.cpp
View file @
da64ad06
...
@@ -2086,7 +2086,7 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
...
@@ -2086,7 +2086,7 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
return
-
1
;
return
-
1
;
}
}
if
(
!
nostart
)
if
(
nostart
)
ndbout_c
(
"Shutting down nodes with
\"
-n, no start
\"
option, to subsequently start the nodes."
);
ndbout_c
(
"Shutting down nodes with
\"
-n, no start
\"
option, to subsequently start the nodes."
);
result
=
ndb_mgm_restart3
(
m_mgmsrv
,
no_of_nodes
,
node_ids
,
result
=
ndb_mgm_restart3
(
m_mgmsrv
,
no_of_nodes
,
node_ids
,
...
@@ -2106,7 +2106,15 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
...
@@ -2106,7 +2106,15 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
ndbout
<<
"Node"
;
ndbout
<<
"Node"
;
for
(
int
i
=
0
;
i
<
no_of_nodes
;
i
++
)
for
(
int
i
=
0
;
i
<
no_of_nodes
;
i
++
)
ndbout
<<
" "
<<
node_ids
[
i
];
ndbout
<<
" "
<<
node_ids
[
i
];
ndbout_c
(
" is being restarted"
);
ndbout_c
(
": Is being restarted"
);
ndbout
<<
"Node"
;
for
(
int
i
=
0
;
i
<
no_of_nodes
;
i
++
)
ndbout
<<
" "
<<
node_ids
[
i
];
if
(
nostart
)
ndbout_c
(
": No start"
);
else
ndbout_c
(
": Is rejoining the cluster"
);
}
}
if
(
need_disconnect
)
if
(
need_disconnect
)
disconnect
();
disconnect
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment