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

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
This commit is contained in:
bell@sanja.is.com.ua 2004-10-24 11:58:25 +03:00
commit 3930527b3d
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ndb/src/cw/cpcd/Process.cpp
View file

@ -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);

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

@ -1494,6 +1494,7 @@ DbUtil::execUTIL_SEQUENCE_REQ(Signal* signal){
break;
default:
ndbrequire(false);
prepOp = 0; // remove warning
}
/**

7
ndb/src/mgmsrv/MgmtSrvr.cpp
View file

@ -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 ;

4
ndb/src/mgmsrv/Services.cpp
View file

@ -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)i<EventLogger::matrixSize; i++){
@ -1262,6 +1262,8 @@ MgmStatService::log(int eventType, const Uint32* theData, NodeId nodeId){
break;
}
}
if (cat == LogLevel::llInvalid)
return;
char m_text[256];
EventLogger::getText(m_text, sizeof(m_text), eventType, theData, nodeId);

4
ndb/tools/desc.cpp
View file

@ -74,11 +74,11 @@ int main(int argc, const char** argv){
ndbout << "-- Indexes -- " << endl;
ndbout << "PRIMARY KEY(";
unsigned j;
for (j= 0; j < pTab->getNoOfPrimaryKeys(); 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;