diff --git a/ndb/include/kernel/LogLevel.hpp b/ndb/include/kernel/LogLevel.hpp index 52c2f70cda80e9cd70f6388bfd3f5005cabaad01..be0627c98a89e949944d042b8071868444492bc5 100644 --- a/ndb/include/kernel/LogLevel.hpp +++ b/ndb/include/kernel/LogLevel.hpp @@ -64,7 +64,7 @@ public: /** * No of categories */ -#define _LOGLEVEL_CATEGORIES (CFG_MAX_LOGLEVEL - CFG_MIN_LOGLEVEL + 1); +#define _LOGLEVEL_CATEGORIES (CFG_MAX_LOGLEVEL - CFG_MIN_LOGLEVEL + 1) static const Uint32 LOGLEVEL_CATEGORIES = _LOGLEVEL_CATEGORIES; void clear(); diff --git a/ndb/include/util/version.h b/ndb/include/util/version.h index a82ae4b8b523dcc8b000693c466be92c5a31b465..5459e44b818124d69b28d3ef8742040f379557ad 100644 --- a/ndb/include/util/version.h +++ b/ndb/include/util/version.h @@ -30,7 +30,7 @@ extern "C" { Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build); - char* getVersionString(Uint32 version, char * status); + const char* getVersionString(Uint32 version, const char * status); void ndbPrintVersion(); Uint32 ndbGetOwnVersion(); diff --git a/ndb/src/common/util/version.c b/ndb/src/common/util/version.c index b8408c7f20122523f7681469836efb0f93f24760..e2515b243b1f313bb1687326793c3724412cbc6a 100644 --- a/ndb/src/common/util/version.c +++ b/ndb/src/common/util/version.c @@ -35,7 +35,7 @@ Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build) { } -char * getVersionString(Uint32 version, char * status) { +const char * getVersionString(Uint32 version, const char * status) { char buff[100]; if (status && status[0] != 0) snprintf(buff, sizeof(buff), diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp index 684c10dbd4ddd1c0000fdedd9886d1e729c543f4..5242237a638f7b61d83e6abb003a30c81da175f2 100644 --- a/ndb/src/mgmsrv/Services.cpp +++ b/ndb/src/mgmsrv/Services.cpp @@ -1244,6 +1244,7 @@ operator<<(NdbOut& out, const LogLevel & ll) for(size_t i = 0; i<LogLevel::LOGLEVEL_CATEGORIES; i++) out << ll.getLogLevel((LogLevel::EventCategory)i) << " "; out << "]"; + return out; } void