Commit 113b322e authored by tulin@build.mysql.com's avatar tulin@build.mysql.com

removed compiler warnings

parent 26d8fc49
...@@ -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");
......
...@@ -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;
......
...@@ -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
} }
......
...@@ -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"));
} }
......
...@@ -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;
......
...@@ -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;
......
...@@ -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;
......
...@@ -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()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment