diff --git a/ndb/include/kernel/LogLevel.hpp b/ndb/include/kernel/LogLevel.hpp index be0627c98a8..6cfbe44af86 100644 --- a/ndb/include/kernel/LogLevel.hpp +++ b/ndb/include/kernel/LogLevel.hpp @@ -47,6 +47,7 @@ public: LogLevel & operator= (const LogLevel &); enum EventCategory { + llInvalid = -1, llStartUp = CFG_LOGLEVEL_STARTUP - CFG_MIN_LOGLEVEL, llShutdown = CFG_LOGLEVEL_SHUTDOWN - CFG_MIN_LOGLEVEL, llStatistic = CFG_LOGLEVEL_STATISTICS - CFG_MIN_LOGLEVEL, diff --git a/ndb/include/mgmapi/mgmapi.h b/ndb/include/mgmapi/mgmapi.h index 41fd211063e..6dcf58b44e2 100644 --- a/ndb/include/mgmapi/mgmapi.h +++ b/ndb/include/mgmapi/mgmapi.h @@ -271,7 +271,10 @@ extern "C" { * Log categories */ enum ndb_mgm_event_category { - NDB_MGM_ILLEGAL_EVENT_CATEGORY = -1, /*< Invalid + /** + * Invalid + */ + NDB_MGM_ILLEGAL_EVENT_CATEGORY = -1, /** * Events during all kinds of startups */ diff --git a/ndb/src/common/debugger/EventLogger.cpp b/ndb/src/common/debugger/EventLogger.cpp index cd995631a04..8a09be9a0a7 100644 --- a/ndb/src/common/debugger/EventLogger.cpp +++ b/ndb/src/common/debugger/EventLogger.cpp @@ -1343,7 +1343,7 @@ EventLogger::log(int eventType, const Uint32* theData, NodeId nodeId, { Uint32 threshold = 0; Logger::LoggerLevel severity = Logger::LL_WARNING; - LogLevel::EventCategory cat; + LogLevel::EventCategory cat= LogLevel::llInvalid; for(unsigned i = 0; igetLogLevel(cat) : m_logLevel.getLogLevel(cat); if (threshold <= set){ diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp index 0150ef2fc2f..9a1bbd86562 100644 --- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp +++ b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp @@ -2369,7 +2369,7 @@ void Dbacc::execACC_COMMITREQ(Signal* signal) ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec); rootfragrecptr.p->noOfElements++; fragrecptr.p->slack -= operationRecPtr.p->insertDeleteLen; - if (fragrecptr.p->slack >= (Uint32)(1 << 31)) { + if (fragrecptr.p->slack >= (1u << 31)) { /* IT MEANS THAT IF SLACK < ZERO */ if (fragrecptr.p->expandFlag == 0) { jam(); @@ -2479,7 +2479,7 @@ void Dbacc::execACC_LOCKREQ(Signal* signal) Uint32 opCode = ZSCAN_OP; signal->theData[0] = operationRecPtr.i; signal->theData[1] = fragrecptr.i; - signal->theData[2] = opCode | (lockMode << 4) | (1 << 31); + signal->theData[2] = opCode | (lockMode << 4) | (1u << 31); signal->theData[3] = req->hashValue; signal->theData[4] = 1; // fake primKeyLen signal->theData[5] = req->transId1; @@ -6510,7 +6510,7 @@ void Dbacc::endofexpLab(Signal* signal) Uint32 noOfBuckets = (fragrecptr.p->maxp + 1) + fragrecptr.p->p; Uint32 Thysteres = fragrecptr.p->maxloadfactor - fragrecptr.p->minloadfactor; fragrecptr.p->slackCheck = noOfBuckets * Thysteres; - if (fragrecptr.p->slack > (Uint32)(1 << 31)) { + if (fragrecptr.p->slack > (1u << 31)) { jam(); /* IT MEANS THAT IF SLACK < ZERO */ /* --------------------------------------------------------------------------------- */ @@ -6974,7 +6974,7 @@ void Dbacc::execSHRINKCHECK2(Signal* signal) /*--------------------------------------------------------------*/ return; }//if - if (fragrecptr.p->slack > (Uint32)(1 << 31)) { + if (fragrecptr.p->slack > (1u << 31)) { jam(); /*--------------------------------------------------------------*/ /* THE SLACK IS NEGATIVE, IN THIS CASE WE WILL NOT NEED ANY */ @@ -7213,7 +7213,7 @@ void Dbacc::endofshrinkbucketLab(Signal* signal) expDirRangePtr.p->dirArray[fragrecptr.p->expSenderDirIndex >> 8] = RNIL; }//if }//if - if (fragrecptr.p->slack < (Uint32)(1 << 31)) { + if (fragrecptr.p->slack < (1u << 31)) { jam(); /*--------------------------------------------------------------*/ /* THE SLACK IS POSITIVE, IN THIS CASE WE WILL CHECK WHETHER */ diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp index 6784724c086..76aa745c3e0 100644 --- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp +++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp @@ -4618,6 +4618,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal) /* BUT NOT YET COMPLETED. */ /*--------------------------------------------------*/ ndbrequire(false); + gcpState= MasterGCPConf::GCP_READY; // remove warning break; default: /*------------------------------------------------*/ @@ -4627,6 +4628,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal) /* NODE WHICH WAS NOT A MASTER NODE. */ /*------------------------------------------------*/ ndbrequire(false); + gcpState= MasterGCPConf::GCP_READY; // remove warning break; }//switch MasterGCPConf * const masterGCPConf = (MasterGCPConf *)&signal->theData[0]; @@ -5535,6 +5537,7 @@ Dbdih::sendMASTER_LCPCONF(Signal * signal){ * it not allowed */ ndbrequire(false); + lcpState= MasterLCPConf::LCP_STATUS_IDLE; // remove warning break; case LCP_COPY_GCI: case LCP_INIT_TABLES: @@ -5543,6 +5546,7 @@ Dbdih::sendMASTER_LCPCONF(Signal * signal){ * These two states are handled by if statements above */ ndbrequire(false); + lcpState= MasterLCPConf::LCP_STATUS_IDLE; // remove warning break; }//switch ndbrequire(ok); @@ -12738,6 +12742,7 @@ void Dbdih::setNodeRestartInfoBits() break; default: ndbrequire(false); + tsnrNodeActiveStatus = Sysfile::NS_NotDefined; // remove warning break; }//switch Sysfile::setNodeStatus(nodePtr.i, SYSFILE->nodeStatus, diff --git a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp index d880d3510c8..49de0d80bcd 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp @@ -1100,7 +1100,7 @@ Dbtup::updateStartLab(Signal* signal, Tablerec* const regTabPtr, Page* const pagePtr) { - Uint32 retValue; + int retValue; if (regOperPtr->optype == ZINSERT) { jam(); setNullBits(pagePtr, regTabPtr, regOperPtr->pageOffset); diff --git a/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp b/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp index be0d86b3f3d..5a8642c4d2e 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp @@ -200,7 +200,8 @@ Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* data operPtr.i = RNIL; operPtr.p = NULL; // do it - int ret = readAttributes(pagePtr.p, pageOffset, attrIds, numAttrs, dataOut, ZNIL, true); + int ret = readAttributes(pagePtr.p, pageOffset, attrIds, + numAttrs, dataOut, ZNIL, true); // restore globals tabptr = tabptr_old; fragptr = fragptr_old; @@ -220,7 +221,7 @@ Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* data n += 1; i += 1 + size; } - ndbrequire(i == ret); + ndbrequire((int)i == ret); ret -= numAttrs; } else { ret = terrorCode ? (-(int)terrorCode) : -1; diff --git a/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp b/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp index 0a961903340..aac5c326cad 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp @@ -652,6 +652,7 @@ void Dbtup::executeTrigger(Signal* signal, return; default: ndbrequire(false); + executeDirect= false; // remove warning }//switch regOperPtr->noFiredTriggers++; @@ -1077,6 +1078,7 @@ Dbtup::executeTuxCommitTriggers(Signal* signal, ndbrequire(tupVersion == regOperPtr->tupVersion); } else { ndbrequire(false); + tupVersion= 0; // remove warning } // fill in constant part req->tableId = regOperPtr->tableRef; @@ -1121,6 +1123,7 @@ Dbtup::executeTuxAbortTriggers(Signal* signal, return; } else { ndbrequire(false); + tupVersion= 0; // remove warning } // fill in constant part req->tableId = regOperPtr->tableRef; diff --git a/ndb/src/ndbapi/NdbConnection.cpp b/ndb/src/ndbapi/NdbConnection.cpp index c142efb1596..1457792cf28 100644 --- a/ndb/src/ndbapi/NdbConnection.cpp +++ b/ndb/src/ndbapi/NdbConnection.cpp @@ -313,8 +313,8 @@ NdbConnection::execute(ExecType aTypeOfExec, tPrepOp = tPrepOp->next(); } // save rest of prepared ops if batch - NdbOperation* tRestOp; - NdbOperation* tLastOp; + NdbOperation* tRestOp= 0; + NdbOperation* tLastOp= 0; if (tPrepOp != NULL) { tRestOp = tPrepOp->next(); tPrepOp->next(NULL); diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp index b23bc8cfe4d..fd63ce96f25 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -1182,7 +1182,7 @@ NdbIndexScanOperation::insertBOUNDS(Uint32 * data, Uint32 sz){ len = (KeyInfo::DataLength - remaining) + len; break; } - } while(sz >= 0); + } while(true); theTotalNrOfKeyWordInSignal = len; return 0;