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
1c4cb230
Commit
1c4cb230
authored
Aug 24, 2004
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use "configured" socklen_t
Fix master printout
parent
90e6e892
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
4 deletions
+12
-4
ndb/src/mgmclient/CommandInterpreter.cpp
ndb/src/mgmclient/CommandInterpreter.cpp
+9
-1
ndb/src/mgmsrv/MgmtSrvr.cpp
ndb/src/mgmsrv/MgmtSrvr.cpp
+1
-1
ndb/src/mgmsrv/MgmtSrvr.hpp
ndb/src/mgmsrv/MgmtSrvr.hpp
+1
-1
ndb/src/mgmsrv/Services.cpp
ndb/src/mgmsrv/Services.cpp
+1
-1
No files found.
ndb/src/mgmclient/CommandInterpreter.cpp
View file @
1c4cb230
...
@@ -654,13 +654,21 @@ CommandInterpreter::executeShow(char* parameters)
...
@@ -654,13 +654,21 @@ CommandInterpreter::executeShow(char* parameters)
api_nodes
=
0
,
api_nodes
=
0
,
mgm_nodes
=
0
;
mgm_nodes
=
0
;
for
(
i
=
0
;
i
<
state
->
no_of_nodes
;
i
++
)
{
if
(
state
->
node_states
[
i
].
node_type
==
NDB_MGM_NODE_TYPE_NDB
&&
state
->
node_states
[
i
].
version
!=
0
){
master_id
=
state
->
node_states
[
i
].
dynamic_id
;
break
;
}
}
for
(
i
=
0
;
i
<
state
->
no_of_nodes
;
i
++
)
{
for
(
i
=
0
;
i
<
state
->
no_of_nodes
;
i
++
)
{
switch
(
state
->
node_states
[
i
].
node_type
)
{
switch
(
state
->
node_states
[
i
].
node_type
)
{
case
NDB_MGM_NODE_TYPE_API
:
case
NDB_MGM_NODE_TYPE_API
:
api_nodes
++
;
api_nodes
++
;
break
;
break
;
case
NDB_MGM_NODE_TYPE_NDB
:
case
NDB_MGM_NODE_TYPE_NDB
:
if
(
state
->
node_states
[
i
].
dynamic_id
>
master_id
)
if
(
state
->
node_states
[
i
].
dynamic_id
<
master_id
)
master_id
=
state
->
node_states
[
i
].
dynamic_id
;
master_id
=
state
->
node_states
[
i
].
dynamic_id
;
ndb_nodes
++
;
ndb_nodes
++
;
break
;
break
;
...
...
ndb/src/mgmsrv/MgmtSrvr.cpp
View file @
1c4cb230
...
@@ -2304,7 +2304,7 @@ bool
...
@@ -2304,7 +2304,7 @@ bool
MgmtSrvr
::
alloc_node_id
(
NodeId
*
nodeId
,
MgmtSrvr
::
alloc_node_id
(
NodeId
*
nodeId
,
enum
ndb_mgm_node_type
type
,
enum
ndb_mgm_node_type
type
,
struct
sockaddr
*
client_addr
,
struct
sockaddr
*
client_addr
,
socklen_t
*
client_addr_len
)
SOCKET_SIZE_TYPE
*
client_addr_len
)
{
{
Guard
g
(
&
f_node_id_mutex
);
Guard
g
(
&
f_node_id_mutex
);
#if 0
#if 0
...
...
ndb/src/mgmsrv/MgmtSrvr.hpp
View file @
1c4cb230
...
@@ -467,7 +467,7 @@ public:
...
@@ -467,7 +467,7 @@ public:
*/
*/
bool
getNextNodeId
(
NodeId
*
_nodeId
,
enum
ndb_mgm_node_type
type
)
const
;
bool
getNextNodeId
(
NodeId
*
_nodeId
,
enum
ndb_mgm_node_type
type
)
const
;
bool
alloc_node_id
(
NodeId
*
_nodeId
,
enum
ndb_mgm_node_type
type
,
bool
alloc_node_id
(
NodeId
*
_nodeId
,
enum
ndb_mgm_node_type
type
,
struct
sockaddr
*
client_addr
,
socklen_t
*
client_addr_len
);
struct
sockaddr
*
client_addr
,
SOCKET_SIZE_TYPE
*
client_addr_len
);
/**
/**
*
*
...
...
ndb/src/mgmsrv/Services.cpp
View file @
1c4cb230
...
@@ -402,7 +402,7 @@ MgmApiSession::get_nodeid(Parser_t::Context &,
...
@@ -402,7 +402,7 @@ MgmApiSession::get_nodeid(Parser_t::Context &,
}
}
struct
sockaddr
addr
;
struct
sockaddr
addr
;
socklen_t
addrlen
=
sizeof
(
addr
);
SOCKET_SIZE_TYPE
addrlen
=
sizeof
(
addr
);
int
r
=
getpeername
(
m_socket
,
&
addr
,
&
addrlen
);
int
r
=
getpeername
(
m_socket
,
&
addr
,
&
addrlen
);
if
(
r
!=
0
)
{
if
(
r
!=
0
)
{
m_output
->
println
(
cmd
);
m_output
->
println
(
cmd
);
...
...
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