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
113b322e
Commit
113b322e
authored
Jan 19, 2005
by
tulin@build.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed compiler warnings
parent
26d8fc49
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
13 deletions
+13
-13
ndb/src/common/util/Bitmask.cpp
ndb/src/common/util/Bitmask.cpp
+1
-1
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+1
-1
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
+1
-1
ndb/src/mgmapi/mgmapi.cpp
ndb/src/mgmapi/mgmapi.cpp
+2
-2
ndb/src/ndbapi/Ndb.cpp
ndb/src/ndbapi/Ndb.cpp
+2
-2
ndb/src/ndbapi/NdbDictionaryImpl.cpp
ndb/src/ndbapi/NdbDictionaryImpl.cpp
+1
-3
ndb/src/ndbapi/TransporterFacade.cpp
ndb/src/ndbapi/TransporterFacade.cpp
+2
-2
ndb/src/ndbapi/ndb_cluster_connection.cpp
ndb/src/ndbapi/ndb_cluster_connection.cpp
+3
-1
No files found.
ndb/src/common/util/Bitmask.cpp
View file @
113b322e
...
@@ -5,7 +5,7 @@ static
...
@@ -5,7 +5,7 @@ static
void
print
(
const
Uint32
src
[],
Uint32
len
,
Uint32
pos
=
0
)
void
print
(
const
Uint32
src
[],
Uint32
len
,
Uint32
pos
=
0
)
{
{
printf
(
"b'"
);
printf
(
"b'"
);
for
(
int
i
=
0
;
i
<
len
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
len
;
i
++
)
{
{
if
(
BitmaskImpl
::
get
((
pos
+
len
+
31
)
>>
5
,
src
,
i
+
pos
))
if
(
BitmaskImpl
::
get
((
pos
+
len
+
31
)
>>
5
,
src
,
i
+
pos
))
printf
(
"1"
);
printf
(
"1"
);
...
...
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file @
113b322e
...
@@ -4350,7 +4350,7 @@ Dbdict::execTAB_COMMITCONF(Signal* signal){
...
@@ -4350,7 +4350,7 @@ Dbdict::execTAB_COMMITCONF(Signal* signal){
}
}
tAttr
=
aRec
->
nextAttrInTable
;
tAttr
=
aRec
->
nextAttrInTable
;
}
}
ndbrequire
(
sz
==
2
*
tabPtr
.
p
->
noOfPrimkey
);
ndbrequire
(
(
int
)
sz
==
2
*
tabPtr
.
p
->
noOfPrimkey
);
LinearSectionPtr
lsPtr
[
3
];
LinearSectionPtr
lsPtr
[
3
];
lsPtr
[
0
].
p
=
buf
;
lsPtr
[
0
].
p
=
buf
;
...
...
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
View file @
113b322e
...
@@ -262,7 +262,7 @@ Dbtux::readKeyAttrs(const Frag& frag, TreeEnt ent, unsigned start, Data keyData)
...
@@ -262,7 +262,7 @@ Dbtux::readKeyAttrs(const Frag& frag, TreeEnt ent, unsigned start, Data keyData)
debugOut
<<
endl
;
debugOut
<<
endl
;
totalSize
+=
1
+
dataSize
;
totalSize
+=
1
+
dataSize
;
}
}
ndbassert
(
totalSize
==
ret
);
ndbassert
(
(
int
)
totalSize
==
ret
);
}
}
#endif
#endif
}
}
...
...
ndb/src/mgmapi/mgmapi.cpp
View file @
113b322e
...
@@ -314,8 +314,8 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
...
@@ -314,8 +314,8 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
*/
*/
ndbout
<<
"Error in mgm protocol parser. "
ndbout
<<
"Error in mgm protocol parser. "
<<
"cmd: '"
<<
cmd
<<
"cmd: '"
<<
cmd
<<
"' status="
<<
ctx
.
m_status
<<
"' status="
<<
(
Uint32
)
ctx
.
m_status
<<
", curr="
<<
ctx
.
m_currentToken
<<
", curr="
<<
(
Uint32
)
ctx
.
m_currentToken
<<
endl
;
<<
endl
;
DBUG_PRINT
(
"info"
,(
"parser.parse returned NULL"
));
DBUG_PRINT
(
"info"
,(
"parser.parse returned NULL"
));
}
}
...
...
ndb/src/ndbapi/Ndb.cpp
View file @
113b322e
...
@@ -47,7 +47,7 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
...
@@ -47,7 +47,7 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
{
{
Uint32
tNode
;
Uint32
tNode
;
Uint32
tAnyAlive
=
0
;
Uint32
tAnyAlive
=
0
;
int
TretCode
;
int
TretCode
=
0
;
if
(
tConNode
!=
0
)
{
if
(
tConNode
!=
0
)
{
TretCode
=
NDB_connect
(
tConNode
);
TretCode
=
NDB_connect
(
tConNode
);
...
@@ -892,7 +892,7 @@ Ndb::opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op)
...
@@ -892,7 +892,7 @@ Ndb::opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op)
DBUG_PRINT
(
"enter"
,
(
"table=%u value=%llu op=%u"
,
aTableId
,
opValue
,
op
));
DBUG_PRINT
(
"enter"
,
(
"table=%u value=%llu op=%u"
,
aTableId
,
opValue
,
op
));
NdbTransaction
*
tConnection
;
NdbTransaction
*
tConnection
;
NdbOperation
*
tOperation
;
NdbOperation
*
tOperation
=
0
;
// Compiler warning if not initialized
Uint64
tValue
;
Uint64
tValue
;
NdbRecAttr
*
tRecAttrResult
;
NdbRecAttr
*
tRecAttrResult
;
int
result
;
int
result
;
...
...
ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file @
113b322e
...
@@ -1361,9 +1361,7 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret,
...
@@ -1361,9 +1361,7 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret,
}
}
Uint32
topBit
=
(
1
<<
31
);
Uint32
topBit
=
(
1
<<
31
);
for
(
i
=
31
;
i
>=
0
;
i
--
){
for
(;
topBit
&&
!
(
fragCount
&
topBit
);
){
if
((
fragCount
&
topBit
)
!=
0
)
break
;
topBit
>>=
1
;
topBit
>>=
1
;
}
}
impl
->
m_hashValueMask
=
topBit
-
1
;
impl
->
m_hashValueMask
=
topBit
-
1
;
...
...
ndb/src/ndbapi/TransporterFacade.cpp
View file @
113b322e
...
@@ -473,12 +473,12 @@ void TransporterFacade::threadMainReceive(void)
...
@@ -473,12 +473,12 @@ void TransporterFacade::threadMainReceive(void)
}
}
TransporterFacade
::
TransporterFacade
(
NdbMgmHandle
mgm_handle
)
:
TransporterFacade
::
TransporterFacade
(
NdbMgmHandle
mgm_handle
)
:
m_mgm_handle
(
mgm_handle
),
theTransporterRegistry
(
0
),
theTransporterRegistry
(
0
),
theStopReceive
(
0
),
theStopReceive
(
0
),
theSendThread
(
NULL
),
theSendThread
(
NULL
),
theReceiveThread
(
NULL
),
theReceiveThread
(
NULL
),
m_fragmented_signal_id
(
0
),
m_fragmented_signal_id
(
0
)
m_mgm_handle
(
mgm_handle
)
{
{
theOwnId
=
0
;
theOwnId
=
0
;
...
...
ndb/src/ndbapi/ndb_cluster_connection.cpp
View file @
113b322e
...
@@ -491,7 +491,9 @@ int Ndb_cluster_connection::connect(int no_retries, int retry_delay_in_seconds,
...
@@ -491,7 +491,9 @@ int Ndb_cluster_connection::connect(int no_retries, int retry_delay_in_seconds,
m_impl
.
m_transporter_facade
->
start_instance
(
nodeId
,
props
);
m_impl
.
m_transporter_facade
->
start_instance
(
nodeId
,
props
);
m_impl
.
init_nodes_vector
(
nodeId
,
*
props
);
m_impl
.
init_nodes_vector
(
nodeId
,
*
props
);
for
(
int
i
=
0
;
i
<
m_impl
.
m_transporter_facade
->
get_registry
()
->
m_transporter_interface
.
size
();
i
++
)
for
(
unsigned
i
=
0
;
i
<
m_impl
.
m_transporter_facade
->
get_registry
()
->
m_transporter_interface
.
size
();
i
++
)
ndb_mgm_set_connection_int_parameter
(
m_impl
.
m_config_retriever
->
get_mgmHandle
(),
ndb_mgm_set_connection_int_parameter
(
m_impl
.
m_config_retriever
->
get_mgmHandle
(),
nodeId
,
nodeId
,
m_impl
.
m_transporter_facade
->
get_registry
()
m_impl
.
m_transporter_facade
->
get_registry
()
...
...
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