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
9ccbdc6b
Commit
9ccbdc6b
authored
Oct 22, 2004
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove compiler warnings
parent
8c391e7c
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
15 deletions
+18
-15
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
+1
-1
ndb/src/kernel/blocks/dbutil/DbUtil.cpp
ndb/src/kernel/blocks/dbutil/DbUtil.cpp
+1
-0
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
+1
-1
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+7
-6
ndb/src/kernel/blocks/suma/Suma.cpp
ndb/src/kernel/blocks/suma/Suma.cpp
+2
-1
ndb/test/src/NDBT_Table.cpp
ndb/test/src/NDBT_Table.cpp
+3
-3
ndb/tools/waiter.cpp
ndb/tools/waiter.cpp
+3
-3
No files found.
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
View file @
9ccbdc6b
...
@@ -104,7 +104,7 @@ Dbtux::searchToAdd(Frag& frag, ConstData searchKey, TreeEnt searchEnt, TreePos&
...
@@ -104,7 +104,7 @@ Dbtux::searchToAdd(Frag& frag, ConstData searchKey, TreeEnt searchEnt, TreePos&
treePos
.
m_loc
=
currNode
.
m_loc
;
treePos
.
m_loc
=
currNode
.
m_loc
;
// binary search
// binary search
int
lo
=
-
1
;
int
lo
=
-
1
;
int
hi
=
currNode
.
getOccup
();
unsigned
hi
=
currNode
.
getOccup
();
int
ret
;
int
ret
;
while
(
1
)
{
while
(
1
)
{
jam
();
jam
();
...
...
ndb/src/kernel/blocks/dbutil/DbUtil.cpp
View file @
9ccbdc6b
...
@@ -1059,6 +1059,7 @@ DbUtil::prepareOperation(Signal* signal, PreparePtr prepPtr)
...
@@ -1059,6 +1059,7 @@ DbUtil::prepareOperation(Signal* signal, PreparePtr prepPtr)
ndbrequire
(
prepPagesReader
.
getValueLen
()
<=
MAX_ATTR_NAME_SIZE
);
ndbrequire
(
prepPagesReader
.
getValueLen
()
<=
MAX_ATTR_NAME_SIZE
);
prepPagesReader
.
getString
(
attrNameRequested
);
prepPagesReader
.
getString
(
attrNameRequested
);
attrIdRequested
=
~
0u
;
}
else
{
}
else
{
jam
();
jam
();
attrIdRequested
=
prepPagesReader
.
getUint32
();
attrIdRequested
=
prepPagesReader
.
getUint32
();
...
...
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
View file @
9ccbdc6b
...
@@ -37,9 +37,9 @@ void Ndbcntr::initRecords()
...
@@ -37,9 +37,9 @@ void Ndbcntr::initRecords()
Ndbcntr
::
Ndbcntr
(
const
class
Configuration
&
conf
)
:
Ndbcntr
::
Ndbcntr
(
const
class
Configuration
&
conf
)
:
SimulatedBlock
(
NDBCNTR
,
conf
),
SimulatedBlock
(
NDBCNTR
,
conf
),
c_stopRec
(
*
this
),
cnoWaitrep6
(
0
),
cnoWaitrep6
(
0
),
cnoWaitrep7
(
0
),
cnoWaitrep7
(
0
),
c_stopRec
(
*
this
),
c_missra
(
*
this
)
c_missra
(
*
this
)
{
{
...
...
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
View file @
9ccbdc6b
...
@@ -1760,8 +1760,8 @@ void Qmgr::execAPI_FAILCONF(Signal* signal)
...
@@ -1760,8 +1760,8 @@ void Qmgr::execAPI_FAILCONF(Signal* signal)
}
else
{
}
else
{
jam
();
jam
();
#ifdef VM_TRACE
#ifdef VM_TRACE
ndbout
<<
"failedNodePtr.p->failState = "
<<
failedNodePtr
.
p
->
failState
ndbout
<<
"failedNodePtr.p->failState = "
<<
endl
;
<<
(
Uint32
)(
failedNodePtr
.
p
->
failState
)
<<
endl
;
#endif
#endif
systemErrorLab
(
signal
);
systemErrorLab
(
signal
);
}
//if
}
//if
...
@@ -1932,10 +1932,6 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
...
@@ -1932,10 +1932,6 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
bool
compatability_check
;
bool
compatability_check
;
switch
(
getNodeInfo
(
apiNodePtr
.
i
).
getType
()){
switch
(
getNodeInfo
(
apiNodePtr
.
i
).
getType
()){
case
NodeInfo
:
:
DB
:
case
NodeInfo
:
:
INVALID
:
sendApiRegRef
(
signal
,
ref
,
ApiRegRef
::
WrongType
);
return
;
case
NodeInfo
:
:
API
:
case
NodeInfo
:
:
API
:
compatability_check
=
ndbCompatible_ndb_api
(
NDB_VERSION
,
version
);
compatability_check
=
ndbCompatible_ndb_api
(
NDB_VERSION
,
version
);
break
;
break
;
...
@@ -1945,6 +1941,11 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
...
@@ -1945,6 +1941,11 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
case
NodeInfo
:
:
REP
:
case
NodeInfo
:
:
REP
:
compatability_check
=
ndbCompatible_ndb_api
(
NDB_VERSION
,
version
);
compatability_check
=
ndbCompatible_ndb_api
(
NDB_VERSION
,
version
);
break
;
break
;
case
NodeInfo
:
:
DB
:
case
NodeInfo
:
:
INVALID
:
default:
sendApiRegRef
(
signal
,
ref
,
ApiRegRef
::
WrongType
);
return
;
}
}
if
(
!
compatability_check
)
{
if
(
!
compatability_check
)
{
...
...
ndb/src/kernel/blocks/suma/Suma.cpp
View file @
9ccbdc6b
...
@@ -98,7 +98,7 @@ Suma::getNodeGroupMembers(Signal* signal) {
...
@@ -98,7 +98,7 @@ Suma::getNodeGroupMembers(Signal* signal) {
}
}
// ndbout_c("c_noNodesInGroup=%d", c_noNodesInGroup);
// ndbout_c("c_noNodesInGroup=%d", c_noNodesInGroup);
ndbrequire
(
c_noNodesInGroup
>
=
0
);
// at least 1 node in the nodegroup
ndbrequire
(
c_noNodesInGroup
>
0
);
// at least 1 node in the nodegroup
#ifdef NODEFAIL_DEBUG
#ifdef NODEFAIL_DEBUG
for
(
Uint32
i
=
0
;
i
<
c_noNodesInGroup
;
i
++
)
{
for
(
Uint32
i
=
0
;
i
<
c_noNodesInGroup
;
i
++
)
{
...
@@ -2713,6 +2713,7 @@ Suma::getResponsibleSumaNodeId(Uint32 D)
...
@@ -2713,6 +2713,7 @@ Suma::getResponsibleSumaNodeId(Uint32 D)
id
=
RNIL
;
id
=
RNIL
;
}
else
{
}
else
{
jam
();
jam
();
id
=
RNIL
;
const
Uint32
n
=
c_noNodesInGroup
;
// Number nodes in node group
const
Uint32
n
=
c_noNodesInGroup
;
// Number nodes in node group
const
Uint32
C1
=
D
/
n
;
const
Uint32
C1
=
D
/
n
;
const
Uint32
C2
=
D
-
C1
*
n
;
// = D % n;
const
Uint32
C2
=
D
-
C1
*
n
;
// = D % n;
...
...
ndb/test/src/NDBT_Table.cpp
View file @
9ccbdc6b
...
@@ -24,7 +24,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
...
@@ -24,7 +24,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
ndbout
<<
"-- "
<<
tab
.
getName
()
<<
" --"
<<
endl
;
ndbout
<<
"-- "
<<
tab
.
getName
()
<<
" --"
<<
endl
;
ndbout
<<
"Version: "
<<
tab
.
getObjectVersion
()
<<
endl
;
ndbout
<<
"Version: "
<<
tab
.
getObjectVersion
()
<<
endl
;
ndbout
<<
"Fragment type: "
<<
tab
.
getFragmentType
()
<<
endl
;
ndbout
<<
"Fragment type: "
<<
(
unsigned
)
tab
.
getFragmentType
()
<<
endl
;
ndbout
<<
"K Value: "
<<
tab
.
getKValue
()
<<
endl
;
ndbout
<<
"K Value: "
<<
tab
.
getKValue
()
<<
endl
;
ndbout
<<
"Min load factor: "
<<
tab
.
getMinLoadFactor
()
<<
endl
;
ndbout
<<
"Min load factor: "
<<
tab
.
getMinLoadFactor
()
<<
endl
;
ndbout
<<
"Max load factor: "
<<
tab
.
getMaxLoadFactor
()
<<
endl
;
ndbout
<<
"Max load factor: "
<<
tab
.
getMaxLoadFactor
()
<<
endl
;
...
@@ -47,7 +47,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
...
@@ -47,7 +47,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
ndbout
<<
"Retrieved"
<<
endl
;
ndbout
<<
"Retrieved"
<<
endl
;
break
;
break
;
default:
default:
ndbout
<<
"Unknown("
<<
tab
.
getObjectStatus
()
<<
")"
<<
endl
;
ndbout
<<
"Unknown("
<<
(
unsigned
)
tab
.
getObjectStatus
()
<<
")"
<<
endl
;
}
}
ndbout
<<
"-- Attributes -- "
<<
endl
;
ndbout
<<
"-- Attributes -- "
<<
endl
;
...
@@ -81,7 +81,7 @@ class NdbOut& operator <<(class NdbOut&, const NdbDictionary::Index & idx)
...
@@ -81,7 +81,7 @@ class NdbOut& operator <<(class NdbOut&, const NdbDictionary::Index & idx)
ndbout
<<
"OrderedIndex"
;
ndbout
<<
"OrderedIndex"
;
break
;
break
;
default:
default:
ndbout
<<
"Type "
<<
idx
.
getType
();
ndbout
<<
"Type "
<<
(
unsigned
)
idx
.
getType
();
break
;
break
;
}
}
return
ndbout
;
return
ndbout
;
...
...
ndb/tools/waiter.cpp
View file @
9ccbdc6b
...
@@ -68,7 +68,7 @@ int main(int argc, const char** argv){
...
@@ -68,7 +68,7 @@ int main(int argc, const char** argv){
return
NDBT_ProgramExit
(
NDBT_FAILED
);
return
NDBT_ProgramExit
(
NDBT_FAILED
);
}
}
for
(
int
i
=
0
;
i
<
lcfg
.
ids
.
size
();
i
++
)
for
(
unsigned
i
=
0
;
i
<
lcfg
.
ids
.
size
();
i
++
)
{
{
MgmtSrvrId
*
m
=
&
lcfg
.
ids
[
i
];
MgmtSrvrId
*
m
=
&
lcfg
.
ids
[
i
];
...
@@ -292,8 +292,8 @@ waitClusterStatus(const char* _addr,
...
@@ -292,8 +292,8 @@ waitClusterStatus(const char* _addr,
if
(
ndbNode
->
node_status
<
_status
)
if
(
ndbNode
->
node_status
<
_status
)
allInState
=
false
;
allInState
=
false
;
else
else
g_info
<<
"node_status("
<<
ndbNode
->
node_status
g_info
<<
"node_status("
<<
(
unsigned
)
ndbNode
->
node_status
<<
") != _status("
<<
_status
<<
")"
<<
endl
;
<<
") != _status("
<<
(
unsigned
)
_status
<<
")"
<<
endl
;
}
else
if
(
ndbNode
->
start_phase
<
_startphase
)
}
else
if
(
ndbNode
->
start_phase
<
_startphase
)
allInState
=
false
;
allInState
=
false
;
}
else
{
}
else
{
...
...
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