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
02de4368
Commit
02de4368
authored
Jun 26, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/50-work
parents
fd818ae2
a5e1b019
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
16 deletions
+23
-16
ndb/src/kernel/vm/RequestTracker.hpp
ndb/src/kernel/vm/RequestTracker.hpp
+2
-2
ndb/src/kernel/vm/SafeCounter.hpp
ndb/src/kernel/vm/SafeCounter.hpp
+14
-8
ndb/src/mgmsrv/ConfigInfo.cpp
ndb/src/mgmsrv/ConfigInfo.cpp
+7
-6
No files found.
ndb/src/kernel/vm/RequestTracker.hpp
View file @
02de4368
...
...
@@ -26,12 +26,12 @@ public:
void
init
()
{
m_confs
.
clear
();
m_nRefs
=
0
;
}
template
<
typename
SignalClass
>
void
init
(
SafeCounterManager
&
mgr
,
bool
init
(
SafeCounterManager
&
mgr
,
NodeReceiverGroup
rg
,
Uint16
GSN
,
Uint32
senderData
)
{
init
();
SafeCounter
tmp
(
mgr
,
m_sc
);
tmp
.
init
<
SignalClass
>
(
rg
,
GSN
,
senderData
);
return
tmp
.
init
<
SignalClass
>
(
rg
,
GSN
,
senderData
);
}
bool
ignoreRef
(
SafeCounterManager
&
mgr
,
Uint32
nodeId
)
...
...
ndb/src/kernel/vm/SafeCounter.hpp
View file @
02de4368
...
...
@@ -230,10 +230,13 @@ inline
bool
SafeCounter
::
init
(
NodeReceiverGroup
rg
,
Uint16
GSN
,
Uint32
senderData
){
bool
b
=
init
<
Ref
>
(
rg
.
m_block
,
GSN
,
senderData
);
m_nodes
=
rg
.
m_nodes
;
m_count
=
m_nodes
.
count
();
return
b
;
if
(
init
<
Ref
>
(
rg
.
m_block
,
GSN
,
senderData
))
{
m_nodes
=
rg
.
m_nodes
;
m_count
=
m_nodes
.
count
();
return
true
;
}
return
false
;
}
template
<
typename
Ref
>
...
...
@@ -241,10 +244,13 @@ inline
bool
SafeCounter
::
init
(
NodeReceiverGroup
rg
,
Uint32
senderData
){
bool
b
=
init
<
Ref
>
(
rg
.
m_block
,
Ref
::
GSN
,
senderData
);
m_nodes
=
rg
.
m_nodes
;
m_count
=
m_nodes
.
count
();
return
b
;
if
(
init
<
Ref
>
(
rg
.
m_block
,
Ref
::
GSN
,
senderData
))
{
m_nodes
=
rg
.
m_nodes
;
m_count
=
m_nodes
.
count
();
return
true
;
}
return
false
;
}
inline
...
...
ndb/src/mgmsrv/ConfigInfo.cpp
View file @
02de4368
...
...
@@ -30,6 +30,7 @@ extern my_bool opt_core;
#define MAX_LINE_LENGTH 255
#define KEY_INTERNAL 0
#define MAX_INT_RNIL 0xfffffeff
#define MAX_PORT_NO 65535
#define _STR_VALUE(x) #x
#define STR_VALUE(x) _STR_VALUE(x)
...
...
@@ -422,7 +423,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo
::
CI_INT
,
UNDEFINED
,
"1"
,
STR_VALUE
(
MAX_
INT_RNIL
)
},
STR_VALUE
(
MAX_
PORT_NO
)
},
{
CFG_DB_NO_REPLICAS
,
...
...
@@ -1462,7 +1463,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo
::
CI_INT
,
NDB_PORT
,
"0"
,
STR_VALUE
(
MAX_
INT_RNIL
)
},
STR_VALUE
(
MAX_
PORT_NO
)
},
{
KEY_INTERNAL
,
...
...
@@ -1474,7 +1475,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo
::
CI_INT
,
UNDEFINED
,
"0"
,
STR_VALUE
(
MAX_
INT_RNIL
)
},
STR_VALUE
(
MAX_
PORT_NO
)
},
{
CFG_NODE_ARBIT_RANK
,
...
...
@@ -1616,7 +1617,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo
::
CI_INT
,
MANDATORY
,
"0"
,
STR_VALUE
(
MAX_
INT_RNIL
)
},
STR_VALUE
(
MAX_
PORT_NO
)
},
{
CFG_TCP_SEND_BUFFER_SIZE
,
...
...
@@ -1722,7 +1723,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo
::
CI_INT
,
MANDATORY
,
"0"
,
STR_VALUE
(
MAX_
INT_RNIL
)
},
STR_VALUE
(
MAX_
PORT_NO
)
},
{
CFG_SHM_SIGNUM
,
...
...
@@ -1944,7 +1945,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo
::
CI_INT
,
MANDATORY
,
"0"
,
STR_VALUE
(
MAX_
INT_RNIL
)
},
STR_VALUE
(
MAX_
PORT_NO
)
},
{
CFG_SCI_HOST1_ID_0
,
...
...
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