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

remove compiler warnings

Browse source
This commit is contained in:
mysqldev@mysql.com 2004-10-22 16:57:19 +02:00
parent f99d6ccfd0
commit 36e59a681e
7 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,7 @@ Dbtux::searchToAdd(Frag& frag, ConstData searchKey, TreeEnt searchEnt, TreePos&
treePos.m_loc = currNode.m_loc;
// binary search
int lo = -1;
int hi = currNode.getOccup();
unsigned hi = currNode.getOccup();
int ret;
while (1) {
jam();

1
ndb/src/kernel/blocks/dbutil/DbUtil.cpp
View file

@ -1059,6 +1059,7 @@ DbUtil::prepareOperation(Signal* signal, PreparePtr prepPtr)
ndbrequire(prepPagesReader.getValueLen() <= MAX_ATTR_NAME_SIZE);
prepPagesReader.getString(attrNameRequested);
attrIdRequested= ~0u;
} else {
jam();
attrIdRequested = prepPagesReader.getUint32();

2
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
View file

@ -37,9 +37,9 @@ void Ndbcntr::initRecords()
Ndbcntr::Ndbcntr(const class Configuration & conf):
SimulatedBlock(NDBCNTR, conf),
c_stopRec(* this),
cnoWaitrep6(0),
cnoWaitrep7(0),
c_stopRec(* this),
c_missra(* this)
{

13
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
View file

@ -1760,8 +1760,8 @@ void Qmgr::execAPI_FAILCONF(Signal* signal)
} else {
jam();
#ifdef VM_TRACE
ndbout << "failedNodePtr.p->failState = " << failedNodePtr.p->failState
<< endl;
ndbout << "failedNodePtr.p->failState = "
<< (Uint32)(failedNodePtr.p->failState) << endl;
#endif
systemErrorLab(signal);
}//if
@ -1932,10 +1932,6 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
bool compatability_check;
switch(getNodeInfo(apiNodePtr.i).getType()){
case NodeInfo::DB:
case NodeInfo::INVALID:
sendApiRegRef(signal, ref, ApiRegRef::WrongType);
return;
case NodeInfo::API:
compatability_check = ndbCompatible_ndb_api(NDB_VERSION, version);
break;
@ -1945,6 +1941,11 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
case NodeInfo::REP:
compatability_check = ndbCompatible_ndb_api(NDB_VERSION, version);
break;
case NodeInfo::DB:
case NodeInfo::INVALID:
default:
sendApiRegRef(signal, ref, ApiRegRef::WrongType);
return;
}
if (!compatability_check) {

3
ndb/src/kernel/blocks/suma/Suma.cpp
View file

@ -98,7 +98,7 @@ Suma::getNodeGroupMembers(Signal* signal) {
}
// 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
for (Uint32 i = 0; i < c_noNodesInGroup; i++) {
@ -2713,6 +2713,7 @@ Suma::getResponsibleSumaNodeId(Uint32 D)
id = RNIL;
} else {
jam();
id = RNIL;
const Uint32 n = c_noNodesInGroup; // Number nodes in node group
const Uint32 C1 = D / n;
const Uint32 C2 = D - C1*n; // = D % n;

6
ndb/test/src/NDBT_Table.cpp
View file

@ -24,7 +24,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
ndbout << "-- " << tab.getName() << " --" << 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 << "Min load factor: " << tab.getMinLoadFactor()<< endl;
ndbout << "Max load factor: " << tab.getMaxLoadFactor()<< endl;
@ -47,7 +47,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
ndbout << "Retrieved" << endl;
break;
default:
ndbout << "Unknown(" << tab.getObjectStatus() << ")" << endl;
ndbout << "Unknown(" << (unsigned) tab.getObjectStatus() << ")" << endl;
}
ndbout << "-- Attributes -- " << endl;
@ -81,7 +81,7 @@ class NdbOut& operator <<(class NdbOut&, const NdbDictionary::Index & idx)
ndbout << "OrderedIndex";
break;
default:
ndbout << "Type " << idx.getType();
ndbout << "Type " << (unsigned) idx.getType();
break;
}
return ndbout;

6
ndb/tools/waiter.cpp
View file

@ -68,7 +68,7 @@ int main(int argc, const char** argv){
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];
@ -292,8 +292,8 @@ waitClusterStatus(const char* _addr,
if (ndbNode->node_status < _status)
allInState = false;
else
g_info << "node_status(" << ndbNode->node_status
<<") != _status("<<_status<<")"<<endl;
g_info << "node_status(" << (unsigned)ndbNode->node_status
<< ") != _status("<< (unsigned)_status << ")" <<endl;
} else if (ndbNode->start_phase < _startphase)
allInState = false;
} else {