diff --git a/ndb/src/cw/cpcd/Process.cpp b/ndb/src/cw/cpcd/Process.cpp index 2d3973d1aba..2509f34e882 100644 --- a/ndb/src/cw/cpcd/Process.cpp +++ b/ndb/src/cw/cpcd/Process.cpp @@ -237,6 +237,7 @@ set_ulimit(const BaseString & pair){ } else if(list[0] == "t"){ _RLIMIT_FIX(RLIMIT_CPU); } else { + res= -11; errno = EINVAL; } if(res){ @@ -313,7 +314,7 @@ CPCD::Process::do_exec() { } /* Close all filedescriptors */ - for(i = STDERR_FILENO+1; i < getdtablesize(); i++) + for(i = STDERR_FILENO+1; (int)i < getdtablesize(); i++) close(i); execv(m_path.c_str(), argv); diff --git a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp b/ndb/src/kernel/blocks/dbutil/DbUtil.cpp index f5379689a5f..e06d93588f4 100644 --- a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp +++ b/ndb/src/kernel/blocks/dbutil/DbUtil.cpp @@ -1494,6 +1494,7 @@ DbUtil::execUTIL_SEQUENCE_REQ(Signal* signal){ break; default: ndbrequire(false); + prepOp = 0; // remove warning } /** diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index fdaa61973d8..83f349bd435 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -406,11 +406,11 @@ MgmtSrvr::MgmtSrvr(NodeId nodeId, _blockNumber(1), // Hard coded block number since it makes it easy to send // signals to other management servers. _ownReference(0), + m_local_config(local_config), m_allocated_resources(*this), theSignalIdleList(NULL), theWaitState(WAIT_SUBSCRIBE_CONF), - m_statisticsListner(this), - m_local_config(local_config) + m_statisticsListner(this) { DBUG_ENTER("MgmtSrvr::MgmtSrvr"); @@ -967,6 +967,9 @@ MgmtSrvr::versionNode(int processId, bool abort, { return sendVersionReq(processId); } + else + version= 0; + if(m_versionRec.callback != 0) m_versionRec.callback(processId, version, this,0); m_versionRec.inUse = false ; diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp index 201168c1726..5b552836955 100644 --- a/ndb/src/mgmsrv/Services.cpp +++ b/ndb/src/mgmsrv/Services.cpp @@ -1252,7 +1252,7 @@ void MgmStatService::log(int eventType, const Uint32* theData, NodeId nodeId){ Uint32 threshold = 0; - LogLevel::EventCategory cat; + LogLevel::EventCategory cat= LogLevel::llInvalid; int i; for(i = 0; (unsigned)igetNoOfPrimaryKeys(); j++) + for (j= 0; (int)j < pTab->getNoOfPrimaryKeys(); j++) { const NdbDictionary::Column * col = pTab->getColumn(j); ndbout << col->getName(); - if (j < pTab->getNoOfPrimaryKeys()-1) + if ((int)j < pTab->getNoOfPrimaryKeys()-1) ndbout << ", "; } ndbout << ") - UniqueHashIndex" << endl;