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
72127b52
Commit
72127b52
authored
Feb 25, 2005
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG#8786 - ndb_autodiscover, post review
More explicit naming of variables
parent
15de06f2
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
12 deletions
+21
-12
ndb/include/kernel/signaldata/AlterIndx.hpp
ndb/include/kernel/signaldata/AlterIndx.hpp
+4
-2
ndb/include/kernel/signaldata/BuildIndx.hpp
ndb/include/kernel/signaldata/BuildIndx.hpp
+2
-2
ndb/include/kernel/signaldata/CreateIndx.hpp
ndb/include/kernel/signaldata/CreateIndx.hpp
+4
-2
ndb/include/kernel/signaldata/CreateTrig.hpp
ndb/include/kernel/signaldata/CreateTrig.hpp
+4
-2
ndb/include/kernel/signaldata/DropIndx.hpp
ndb/include/kernel/signaldata/DropIndx.hpp
+4
-2
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+1
-0
ndb/src/ndbapi/NdbDictionaryImpl.cpp
ndb/src/ndbapi/NdbDictionaryImpl.cpp
+2
-2
No files found.
ndb/include/kernel/signaldata/AlterIndx.hpp
View file @
72127b52
...
@@ -201,8 +201,10 @@ private:
...
@@ -201,8 +201,10 @@ private:
//Uint32 m_indexVersion;
//Uint32 m_indexVersion;
Uint32
m_errorCode
;
Uint32
m_errorCode
;
Uint32
m_errorLine
;
Uint32
m_errorLine
;
union
{
Uint32
m_errorNode
;
Uint32
m_errorNode
;
Uint32
masterNodeId
;
// if NotMaster
};
public:
public:
AlterIndxConf
*
getConf
()
{
AlterIndxConf
*
getConf
()
{
return
&
m_conf
;
return
&
m_conf
;
...
...
ndb/include/kernel/signaldata/BuildIndx.hpp
View file @
72127b52
...
@@ -242,9 +242,8 @@ public:
...
@@ -242,9 +242,8 @@ public:
AllocationFailure
=
4252
,
AllocationFailure
=
4252
,
InternalError
=
4346
InternalError
=
4346
};
};
STATIC_CONST
(
SignalLength
=
BuildIndxConf
::
SignalLength
+
1
);
STATIC_CONST
(
SignalLength
=
BuildIndxConf
::
SignalLength
+
2
);
private:
//Uint32 m_userRef;
//Uint32 m_userRef;
//Uint32 m_connectionPtr;
//Uint32 m_connectionPtr;
//Uint32 m_requestInfo;
//Uint32 m_requestInfo;
...
@@ -253,6 +252,7 @@ private:
...
@@ -253,6 +252,7 @@ private:
//Uint32 m_indexId;
//Uint32 m_indexId;
BuildIndxConf
m_conf
;
BuildIndxConf
m_conf
;
Uint32
m_errorCode
;
Uint32
m_errorCode
;
Uint32
masterNodeId
;
public:
public:
BuildIndxConf
*
getConf
()
{
BuildIndxConf
*
getConf
()
{
...
...
ndb/include/kernel/signaldata/CreateIndx.hpp
View file @
72127b52
...
@@ -220,8 +220,10 @@ public:
...
@@ -220,8 +220,10 @@ public:
//Uint32 m_indexVersion;
//Uint32 m_indexVersion;
Uint32
m_errorCode
;
Uint32
m_errorCode
;
Uint32
m_errorLine
;
Uint32
m_errorLine
;
union
{
Uint32
m_errorNode
;
Uint32
m_errorNode
;
Uint32
masterNodeId
;
// If NotMaster
};
public:
public:
CreateIndxConf
*
getConf
()
{
CreateIndxConf
*
getConf
()
{
return
&
m_conf
;
return
&
m_conf
;
...
...
ndb/include/kernel/signaldata/CreateTrig.hpp
View file @
72127b52
...
@@ -311,8 +311,10 @@ private:
...
@@ -311,8 +311,10 @@ private:
//Uint32 m_triggerInfo;
//Uint32 m_triggerInfo;
Uint32
m_errorCode
;
Uint32
m_errorCode
;
Uint32
m_errorLine
;
Uint32
m_errorLine
;
union
{
Uint32
m_errorNode
;
Uint32
m_errorNode
;
Uint32
masterNodeId
;
// When NotMaster
};
public:
public:
CreateTrigConf
*
getConf
()
{
CreateTrigConf
*
getConf
()
{
return
&
m_conf
;
return
&
m_conf
;
...
...
ndb/include/kernel/signaldata/DropIndx.hpp
View file @
72127b52
...
@@ -185,8 +185,10 @@ public:
...
@@ -185,8 +185,10 @@ public:
//Uint32 m_indexVersion;
//Uint32 m_indexVersion;
Uint32
m_errorCode
;
Uint32
m_errorCode
;
Uint32
m_errorLine
;
Uint32
m_errorLine
;
union
{
Uint32
m_errorNode
;
Uint32
m_errorNode
;
Uint32
masterNodeId
;
};
public:
public:
DropIndxConf
*
getConf
()
{
DropIndxConf
*
getConf
()
{
return
&
m_conf
;
return
&
m_conf
;
...
...
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file @
72127b52
...
@@ -10237,6 +10237,7 @@ Dbdict::buildIndex_sendReply(Signal* signal, OpBuildIndexPtr opPtr,
...
@@ -10237,6 +10237,7 @@ Dbdict::buildIndex_sendReply(Signal* signal, OpBuildIndexPtr opPtr,
rep
->
setIndexId
(
opPtr
.
p
->
m_request
.
getIndexId
());
rep
->
setIndexId
(
opPtr
.
p
->
m_request
.
getIndexId
());
if
(
sendRef
)
{
if
(
sendRef
)
{
rep
->
setErrorCode
(
opPtr
.
p
->
m_errorCode
);
rep
->
setErrorCode
(
opPtr
.
p
->
m_errorCode
);
rep
->
masterNodeId
=
opPtr
.
p
->
m_errorNode
;
gsn
=
GSN_BUILDINDXREF
;
gsn
=
GSN_BUILDINDXREF
;
length
=
BuildIndxRef
::
SignalLength
;
length
=
BuildIndxRef
::
SignalLength
;
}
}
...
...
ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file @
72127b52
...
@@ -2123,7 +2123,7 @@ NdbDictInterface::execCREATE_INDX_REF(NdbApiSignal * signal,
...
@@ -2123,7 +2123,7 @@ NdbDictInterface::execCREATE_INDX_REF(NdbApiSignal * signal,
const
CreateIndxRef
*
const
ref
=
CAST_CONSTPTR
(
CreateIndxRef
,
signal
->
getDataPtr
());
const
CreateIndxRef
*
const
ref
=
CAST_CONSTPTR
(
CreateIndxRef
,
signal
->
getDataPtr
());
m_error
.
code
=
ref
->
getErrorCode
();
m_error
.
code
=
ref
->
getErrorCode
();
if
(
m_error
.
code
==
ref
->
NotMaster
)
if
(
m_error
.
code
==
ref
->
NotMaster
)
m_masterNodeId
=
ref
->
m
_errorNode
;
m_masterNodeId
=
ref
->
m
asterNodeId
;
m_waiter
.
signal
(
NO_WAIT
);
m_waiter
.
signal
(
NO_WAIT
);
}
}
...
@@ -2249,7 +2249,7 @@ NdbDictInterface::execDROP_INDX_REF(NdbApiSignal * signal,
...
@@ -2249,7 +2249,7 @@ NdbDictInterface::execDROP_INDX_REF(NdbApiSignal * signal,
const
DropIndxRef
*
const
ref
=
CAST_CONSTPTR
(
DropIndxRef
,
signal
->
getDataPtr
());
const
DropIndxRef
*
const
ref
=
CAST_CONSTPTR
(
DropIndxRef
,
signal
->
getDataPtr
());
m_error
.
code
=
ref
->
getErrorCode
();
m_error
.
code
=
ref
->
getErrorCode
();
if
(
m_error
.
code
==
ref
->
NotMaster
)
if
(
m_error
.
code
==
ref
->
NotMaster
)
m_masterNodeId
=
ref
->
m
_errorNode
;
m_masterNodeId
=
ref
->
m
asterNodeId
;
m_waiter
.
signal
(
NO_WAIT
);
m_waiter
.
signal
(
NO_WAIT
);
}
}
...
...
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