summaryrefslogtreecommitdiff
path: root/ndb/src
diff options
context:
space:
mode:
authorunknown <pekka@mysql.com>2004-10-12 14:07:41 +0200
committerunknown <pekka@mysql.com>2004-10-12 14:07:41 +0200
commit64ac84fbe2e008ec3c17b4fde387cd77d9e039fb (patch)
tree365ddc091008f9aabfbe2c1fc3082dcc0433b2f2 /ndb/src
parentdb261af7f480a8f8e328ec741112e279a0da2c10 (diff)
downloadmariadb-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
Diffstat (limited to 'ndb/src')
-rw-r--r--ndb/src/common/util/version.c2
-rw-r--r--ndb/src/mgmsrv/Services.cpp1
2 files changed, 2 insertions, 1 deletions
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