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

Reomeved compiler warnings

Browse source
This commit is contained in:
unknown 2004-09-11 20:53:57 +02:00
parent 68d99512f9
commit 387df2f6a5
9 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/include/mgmcommon/ConfigRetriever.hpp
View file

@ -90,7 +90,7 @@ private:
BaseString _localConfigFileName;
struct LocalConfig _localConfig;
int _ownNodeId;
Uint32 _ownNodeId;
BaseString m_connectString;

2
ndb/src/common/debugger/signaldata/ScanTab.cpp
View file

@ -82,7 +82,7 @@ printSCANTABCONF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 recei
fprintf(output, " Operation(s) [api tc rows len]:\n");
ScanTabConf::OpData * op = (ScanTabConf::OpData*)
(theData + ScanTabConf::SignalLength);
for(int i = 0; i<op_count; i++){
for(size_t i = 0; i<op_count; i++){
if(op->info != ScanTabConf::EndOfData)
fprintf(output, " [0x%x 0x%x %d %d]",
op->apiPtrI, op->tcPtrI,

4
ndb/src/common/mgmcommon/ConfigRetriever.cpp
View file

@ -94,7 +94,7 @@ ConfigRetriever::do_connect(){
while(retry < retry_max){
Uint32 type = CR_ERROR;
BaseString tmp;
for (int i = 0; i<_localConfig.ids.size(); i++){
for (unsigned int i = 0; i<_localConfig.ids.size(); i++){
MgmtSrvrId * m = &_localConfig.ids[i];
switch(m->type){
case MgmId_TCP:
@ -138,7 +138,7 @@ ConfigRetriever::getConfig() {
if(m_handle != 0){
p = getConfig(m_handle);
} else {
for (int i = 0; i<_localConfig.ids.size(); i++){
for (unsigned int i = 0; i<_localConfig.ids.size(); i++){
MgmtSrvrId * m = &_localConfig.ids[i];
switch(m->type){
case MgmId_File:

2
ndb/src/common/mgmcommon/LocalConfig.cpp
View file

@ -241,7 +241,7 @@ bool LocalConfig::readFile(const char * filename, bool &fopenError)
return false;
}
int sz = 1024;
unsigned int sz = 1024;
char* theString = (char*)malloc(sz);
theString[0] = 0;

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

@ -1108,7 +1108,7 @@ void Ndb::setCatalogName(const char * a_catalog_name)
int len = snprintf(prefixName, sizeof(prefixName), "%s%c%s%c",
theDataBase, table_name_separator,
theDataBaseSchema, table_name_separator);
prefixEnd = prefixName + (len < sizeof(prefixName) ? len :
prefixEnd = prefixName + (len < (int) sizeof(prefixName) ? len :
sizeof(prefixName) - 1);
}
}
@ -1127,7 +1127,7 @@ void Ndb::setSchemaName(const char * a_schema_name)
int len = snprintf(prefixName, sizeof(prefixName), "%s%c%s%c",
theDataBase, table_name_separator,
theDataBaseSchema, table_name_separator);
prefixEnd = prefixName + (len < sizeof(prefixName) ? len :
prefixEnd = prefixName + (len < (int) sizeof(prefixName) ? len :
sizeof(prefixName) - 1);
}
}

3
ndb/src/ndbapi/NdbDictionary.cpp
View file

@ -229,7 +229,8 @@ NdbDictionary::Table::Table(const char * name)
}
NdbDictionary::Table::Table(const NdbDictionary::Table & org)
: m_impl(* new NdbTableImpl(* this))
: NdbDictionary::Object(),
m_impl(* new NdbTableImpl(* this))
{
m_impl.assign(org.m_impl);
}

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

@ -385,7 +385,7 @@ void
NdbTableImpl::buildColumnHash(){
const Uint32 size = m_columns.size();
size_t i;
int i;
for(i = 31; i >= 0; i--){
if(((1 << i) & size) != 0){
m_columnHashMask = (1 << (i + 1)) - 1;
@ -395,7 +395,7 @@ NdbTableImpl::buildColumnHash(){
Vector<Uint32> hashValues;
Vector<Vector<Uint32> > chains; chains.fill(size, hashValues);
for(i = 0; i<size; i++){
for(i = 0; i< (int) size; i++){
Uint32 hv = Hash(m_columns[i]->getName()) & 0xFFFE;
Uint32 bucket = hv & m_columnHashMask;
bucket = (bucket < size ? bucket : bucket - size);
@ -409,7 +409,7 @@ NdbTableImpl::buildColumnHash(){
m_columnHash.fill((unsigned)size-1, tmp); // Default no chaining
Uint32 pos = 0; // In overflow vector
for(i = 0; i<size; i++){
for(i = 0; i< (int) size; i++){
Uint32 sz = chains[i].size();
if(sz == 1){
Uint32 col = chains[i][0];
@ -1368,7 +1368,7 @@ NdbDictInterface::createOrAlterTable(Ndb & ndb,
internalName);
bool haveAutoIncrement = false;
Uint64 autoIncrementValue;
Uint64 autoIncrementValue = 0;
for(i = 0; i<sz; i++){
const NdbColumnImpl * col = impl.m_columns[i];
if(col == 0)

12
ndb/src/ndbapi/Ndbif.cpp
View file

@ -375,7 +375,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
break;
case NdbReceiver::NDB_SCANRECEIVER:
tCon->theScanningOp->receiver_delivered(tRec);
theWaiter.m_state = (tWaitState == WAIT_SCAN ? NO_WAIT : tWaitState);
theWaiter.m_state = (((WaitSignalType) tWaitState) == WAIT_SCAN ?
(Uint32) NO_WAIT : tWaitState);
break;
default:
goto InvalidSignal;
@ -747,7 +748,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
switch(com){
case 1:
tCon->theScanningOp->receiver_delivered(tRec);
theWaiter.m_state = (tWaitState == WAIT_SCAN ? NO_WAIT : tWaitState);
theWaiter.m_state = (((WaitSignalType) tWaitState) == WAIT_SCAN ?
(Uint32) NO_WAIT : tWaitState);
break;
case 0:
break;
@ -871,8 +873,8 @@ Ndb::completedTransaction(NdbConnection* aCon)
return;
}//if
} else {
ndbout << "theNoOfSentTransactions = " << theNoOfSentTransactions;
ndbout << " theListState = " << aCon->theListState;
ndbout << "theNoOfSentTransactions = " << (int) theNoOfSentTransactions;
ndbout << " theListState = " << (int) aCon->theListState;
ndbout << " theTransArrayIndex = " << aCon->theTransArrayIndex;
ndbout << endl << flush;
#ifdef VM_TRACE
@ -923,7 +925,7 @@ Ndb::pollCompleted(NdbConnection** aCopyArray)
aCopyArray[i] = theCompletedTransactionsArray[i];
if (aCopyArray[i]->theListState != NdbConnection::InCompletedList) {
ndbout << "pollCompleted error ";
ndbout << aCopyArray[i]->theListState << endl;
ndbout << (int) aCopyArray[i]->theListState << endl;
abort();
}//if
theCompletedTransactionsArray[i] = NULL;

2
ndb/src/ndbapi/Ndbinit.cpp
View file

@ -130,7 +130,7 @@ Ndb::Ndb( const char* aDataBase , const char* aSchema) :
int len = snprintf(prefixName, sizeof(prefixName), "%s%c%s%c",
theDataBase, table_name_separator,
theDataBaseSchema, table_name_separator);
prefixEnd = prefixName + (len < sizeof(prefixName) ? len :
prefixEnd = prefixName + (len < (int) sizeof(prefixName) ? len :
sizeof(prefixName) - 1);
NdbMutex_Lock(&createNdbMutex);