mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed compiler warnings

Browse source
This commit is contained in:
unknown 2005-01-19 14:56:40 +01:00
parent 3234eb5687
commit 58d7968665
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/src/common/util/Bitmask.cpp
View file

@ -5,7 +5,7 @@ static
void print(const Uint32 src[], Uint32 len, Uint32 pos = 0)
{
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))
printf("1");

2
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file

@ -4350,7 +4350,7 @@ Dbdict::execTAB_COMMITCONF(Signal* signal){
}
tAttr = aRec->nextAttrInTable;
}
ndbrequire(sz == 2 * tabPtr.p->noOfPrimkey);
ndbrequire((int)sz == 2 * tabPtr.p->noOfPrimkey);
LinearSectionPtr lsPtr[3];
lsPtr[0].p = buf;

2
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
View file

@ -262,7 +262,7 @@ Dbtux::readKeyAttrs(const Frag& frag, TreeEnt ent, unsigned start, Data keyData)
debugOut << endl;
totalSize += 1 + dataSize;
}
ndbassert(totalSize == ret);
ndbassert((int)totalSize == ret);
}
#endif
}

4
ndb/src/mgmapi/mgmapi.cpp
View file

@ -314,8 +314,8 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
*/
ndbout << "Error in mgm protocol parser. "
<< "cmd: '" << cmd
<< "' status=" << ctx.m_status
<< ", curr=" << ctx.m_currentToken
<< "' status=" << (Uint32)ctx.m_status
<< ", curr=" << (Uint32)ctx.m_currentToken
<< endl;
DBUG_PRINT("info",("parser.parse returned NULL"));
}

4
ndb/src/ndbapi/Ndb.cpp
View file

@ -47,7 +47,7 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
{
Uint32 tNode;
Uint32 tAnyAlive = 0;
int TretCode;
int TretCode= 0;
if (tConNode != 0) {
TretCode = NDB_connect(tConNode);
@ -892,7 +892,7 @@ Ndb::opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op)
DBUG_PRINT("enter", ("table=%u value=%llu op=%u", aTableId, opValue, op));
NdbTransaction* tConnection;
NdbOperation* tOperation;
NdbOperation* tOperation= 0; // Compiler warning if not initialized
Uint64 tValue;
NdbRecAttr* tRecAttrResult;
int result;

4
ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file

@ -1361,9 +1361,7 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret,
}
Uint32 topBit = (1 << 31);
for(i = 31; i>=0; i--){
if((fragCount & topBit) != 0)
break;
for(; topBit && !(fragCount & topBit); ){
topBit >>= 1;
}
impl->m_hashValueMask = topBit - 1;

4
ndb/src/ndbapi/TransporterFacade.cpp
View file

@ -473,12 +473,12 @@ void TransporterFacade::threadMainReceive(void)
}
TransporterFacade::TransporterFacade(NdbMgmHandle mgm_handle) :
m_mgm_handle(mgm_handle),
theTransporterRegistry(0),
theStopReceive(0),
theSendThread(NULL),
theReceiveThread(NULL),
m_fragmented_signal_id(0),
m_mgm_handle(mgm_handle)
m_fragmented_signal_id(0)
{
theOwnId = 0;

4
ndb/src/ndbapi/ndb_cluster_connection.cpp
View file

@ -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.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(),
nodeId,
m_impl.m_transporter_facade->get_registry()