diff options
| author | unknown <pekka@mysql.com> | 2004-10-12 14:07:41 +0200 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2004-10-12 14:07:41 +0200 |
| commit | 64ac84fbe2e008ec3c17b4fde387cd77d9e039fb (patch) | |
| tree | 365ddc091008f9aabfbe2c1fc3082dcc0433b2f2 | |
| parent | db261af7f480a8f8e328ec741112e279a0da2c10 (diff) | |
| download | mariadb-git-64ac84fbe2e008ec3c17b4fde387cd77d9e039fb.tar.gz | |
NDB compile fix sol9x86
ndb/include/kernel/LogLevel.hpp:
compile fix sol9x86
ndb/include/util/version.h:
compile fix sol9x86
ndb/src/common/util/version.c:
compile fix sol9x86
ndb/src/mgmsrv/Services.cpp:
compile fix sol9x86
| -rw-r--r-- | ndb/include/kernel/LogLevel.hpp | 2 | ||||
| -rw-r--r-- | ndb/include/util/version.h | 2 | ||||
| -rw-r--r-- | ndb/src/common/util/version.c | 2 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/Services.cpp | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/ndb/include/kernel/LogLevel.hpp b/ndb/include/kernel/LogLevel.hpp index 52c2f70cda8..be0627c98a8 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 a82ae4b8b52..5459e44b818 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 b8408c7f201..e2515b243b1 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 684c10dbd4d..5242237a638 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 |