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
ead8bb63
Commit
ead8bb63
authored
20 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
parents
15928e77
68e71a6d
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+3
-3
No files found.
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
View file @
ead8bb63
...
...
@@ -525,7 +525,7 @@ void Qmgr::execCM_REGREQ(Signal* signal)
cmRegConf
->
dynamicId
=
TdynId
;
c_clusterNodes
.
copyto
(
NdbNodeBitmask
::
Size
,
cmRegConf
->
allNdbNodes
);
sendSignal
(
Tblockref
,
GSN_CM_REGCONF
,
signal
,
CmRegConf
::
SignalLength
,
JB
B
);
CmRegConf
::
SignalLength
,
JB
A
);
DEBUG_START
(
GSN_CM_REGCONF
,
refToNode
(
Tblockref
),
""
);
/**
...
...
@@ -847,7 +847,7 @@ void Qmgr::execCM_NODEINFOCONF(Signal* signal)
nodePtr
.
i
=
getOwnNodeId
();
ptrAss
(
nodePtr
,
nodeRec
);
ndbrequire
(
nodePtr
.
p
->
phase
==
ZSTARTING
);
ndbrequire
(
c_start
.
m_gsn
=
GSN_CM_NODEINFOREQ
);
ndbrequire
(
c_start
.
m_gsn
=
=
GSN_CM_NODEINFOREQ
);
c_start
.
m_nodes
.
clearWaitingFor
(
nodeId
);
/**
...
...
@@ -1019,7 +1019,7 @@ void Qmgr::execCM_ADD(Signal* signal)
ndbrequire
(
addNodePtr
.
i
==
nodePtr
.
i
);
switch
(
type
){
case
CmAdd
:
:
Prepare
:
ndbrequire
(
c_start
.
m_gsn
=
GSN_CM_NODEINFOREQ
);
ndbrequire
(
c_start
.
m_gsn
=
=
GSN_CM_NODEINFOREQ
);
/**
* Wait for CM_NODEINFO_CONF
*/
...
...
This diff is collapsed.
Click to expand it.
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