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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
37df8f14
Commit
37df8f14
authored
May 17, 2006
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
parents
86c898fe
23be1988
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
storage/ndb/src/mgmapi/mgmapi.cpp
storage/ndb/src/mgmapi/mgmapi.cpp
+3
-0
storage/ndb/tools/waiter.cpp
storage/ndb/tools/waiter.cpp
+6
-0
No files found.
storage/ndb/src/mgmapi/mgmapi.cpp
View file @
37df8f14
...
@@ -701,10 +701,12 @@ ndb_mgm_get_status(NdbMgmHandle handle)
...
@@ -701,10 +701,12 @@ ndb_mgm_get_status(NdbMgmHandle handle)
Vector
<
BaseString
>
split
;
Vector
<
BaseString
>
split
;
tmp
.
split
(
split
,
":"
);
tmp
.
split
(
split
,
":"
);
if
(
split
.
size
()
!=
2
){
if
(
split
.
size
()
!=
2
){
SET_ERROR
(
handle
,
NDB_MGM_ILLEGAL_NODE_STATUS
,
buf
);
return
NULL
;
return
NULL
;
}
}
if
(
!
(
split
[
0
].
trim
()
==
"nodes"
)){
if
(
!
(
split
[
0
].
trim
()
==
"nodes"
)){
SET_ERROR
(
handle
,
NDB_MGM_ILLEGAL_NODE_STATUS
,
buf
);
return
NULL
;
return
NULL
;
}
}
...
@@ -752,6 +754,7 @@ ndb_mgm_get_status(NdbMgmHandle handle)
...
@@ -752,6 +754,7 @@ ndb_mgm_get_status(NdbMgmHandle handle)
if
(
i
+
1
!=
noOfNodes
){
if
(
i
+
1
!=
noOfNodes
){
free
(
state
);
free
(
state
);
SET_ERROR
(
handle
,
NDB_MGM_ILLEGAL_NODE_STATUS
,
"Node count mismatch"
);
return
NULL
;
return
NULL
;
}
}
...
...
storage/ndb/tools/waiter.cpp
View file @
37df8f14
...
@@ -124,6 +124,12 @@ getStatus(){
...
@@ -124,6 +124,12 @@ getStatus(){
ndbout
<<
"status==NULL, retries="
<<
retries
<<
endl
;
ndbout
<<
"status==NULL, retries="
<<
retries
<<
endl
;
MGMERR
(
handle
);
MGMERR
(
handle
);
retries
++
;
retries
++
;
ndb_mgm_disconnect
(
handle
);
if
(
ndb_mgm_connect
(
handle
,
0
,
0
,
1
))
{
MGMERR
(
handle
);
g_err
<<
"Reconnect failed"
<<
endl
;
break
;
}
continue
;
continue
;
}
}
int
count
=
status
->
no_of_nodes
;
int
count
=
status
->
no_of_nodes
;
...
...
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