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
73188c91
Commit
73188c91
authored
Jul 24, 2010
by
Davi Arnaut
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport fixes for some of the more noise compiler warnings in ndb.
parent
7f80eb46
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
+4
-4
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
+2
-2
storage/ndb/src/ndbapi/TransporterFacade.hpp
storage/ndb/src/ndbapi/TransporterFacade.hpp
+2
-2
No files found.
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
View file @
73188c91
...
...
@@ -203,7 +203,7 @@ Uint32 FsOpenReq::getVersion(const Uint32 fileNumber[]){
inline
void
FsOpenReq
::
setVersion
(
Uint32
fileNumber
[],
Uint8
val
){
const
Uint32
t
=
fileNumber
[
3
];
fileNumber
[
3
]
=
t
&
0x00FFFFFF
|
(((
Uint32
)
val
)
<<
24
);
fileNumber
[
3
]
=
(
t
&
0x00FFFFFF
)
|
(((
Uint32
)
val
)
<<
24
);
}
inline
...
...
@@ -214,7 +214,7 @@ Uint32 FsOpenReq::getSuffix(const Uint32 fileNumber[]){
inline
void
FsOpenReq
::
setSuffix
(
Uint32
fileNumber
[],
Uint8
val
){
const
Uint32
t
=
fileNumber
[
3
];
fileNumber
[
3
]
=
t
&
0xFF00FFFF
|
(((
Uint32
)
val
)
<<
16
);
fileNumber
[
3
]
=
(
t
&
0xFF00FFFF
)
|
(((
Uint32
)
val
)
<<
16
);
}
inline
...
...
@@ -225,7 +225,7 @@ Uint32 FsOpenReq::v1_getDisk(const Uint32 fileNumber[]){
inline
void
FsOpenReq
::
v1_setDisk
(
Uint32
fileNumber
[],
Uint8
val
){
const
Uint32
t
=
fileNumber
[
3
];
fileNumber
[
3
]
=
t
&
0xFFFF00FF
|
(((
Uint32
)
val
)
<<
8
);
fileNumber
[
3
]
=
(
t
&
0xFFFF00FF
)
|
(((
Uint32
)
val
)
<<
8
);
}
inline
...
...
@@ -266,7 +266,7 @@ Uint32 FsOpenReq::v1_getP(const Uint32 fileNumber[]){
inline
void
FsOpenReq
::
v1_setP
(
Uint32
fileNumber
[],
Uint8
val
){
const
Uint32
t
=
fileNumber
[
3
];
fileNumber
[
3
]
=
t
&
0xFFFFFF00
|
val
;
fileNumber
[
3
]
=
(
t
&
0xFFFFFF00
)
|
val
;
}
/****************/
...
...
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
View file @
73188c91
...
...
@@ -840,13 +840,13 @@ Dbtux::TreeEnt::cmp(const TreeEnt ent) const
*/
const
unsigned
version_wrap_limit
=
(
1
<<
(
ZTUP_VERSION_BITS
-
1
));
if
(
m_tupVersion
<
ent
.
m_tupVersion
)
{
if
(
ent
.
m_tupVersion
-
m_tupVersion
<
version_wrap_limit
)
if
(
unsigned
(
ent
.
m_tupVersion
-
m_tupVersion
)
<
version_wrap_limit
)
return
-
1
;
else
return
+
1
;
}
if
(
m_tupVersion
>
ent
.
m_tupVersion
)
{
if
(
m_tupVersion
-
ent
.
m_tupVersion
<
version_wrap_limit
)
if
(
unsigned
(
m_tupVersion
-
ent
.
m_tupVersion
)
<
version_wrap_limit
)
return
+
1
;
else
return
-
1
;
...
...
storage/ndb/src/ndbapi/TransporterFacade.hpp
View file @
73188c91
...
...
@@ -366,8 +366,8 @@ bool
TransporterFacade
::
get_node_stopping
(
NodeId
n
)
const
{
const
ClusterMgr
::
Node
&
node
=
theClusterMgr
->
getNodeInfo
(
n
);
return
(
!
node
.
m_state
.
getSingleUserMode
()
&&
(
node
.
m_state
.
startLevel
==
NodeState
::
SL_STOPPING_1
)
||
(
node
.
m_state
.
startLevel
==
NodeState
::
SL_STOPPING_2
));
(
(
node
.
m_state
.
startLevel
==
NodeState
::
SL_STOPPING_1
)
||
(
node
.
m_state
.
startLevel
==
NodeState
::
SL_STOPPING_2
)
));
}
inline
...
...
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