Commit abf1b8fb authored by pekka@mysql.com's avatar pekka@mysql.com

NDB compile fix sol9x86

parent 90015730
...@@ -64,7 +64,7 @@ public: ...@@ -64,7 +64,7 @@ public:
/** /**
* No of categories * 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; static const Uint32 LOGLEVEL_CATEGORIES = _LOGLEVEL_CATEGORIES;
void clear(); void clear();
......
...@@ -30,7 +30,7 @@ extern "C" { ...@@ -30,7 +30,7 @@ extern "C" {
Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build); Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build);
char* getVersionString(Uint32 version, char * status); const char* getVersionString(Uint32 version, const char * status);
void ndbPrintVersion(); void ndbPrintVersion();
Uint32 ndbGetOwnVersion(); Uint32 ndbGetOwnVersion();
......
...@@ -35,7 +35,7 @@ Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build) { ...@@ -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]; char buff[100];
if (status && status[0] != 0) if (status && status[0] != 0)
snprintf(buff, sizeof(buff), snprintf(buff, sizeof(buff),
......
...@@ -1244,6 +1244,7 @@ operator<<(NdbOut& out, const LogLevel & ll) ...@@ -1244,6 +1244,7 @@ operator<<(NdbOut& out, const LogLevel & ll)
for(size_t i = 0; i<LogLevel::LOGLEVEL_CATEGORIES; i++) for(size_t i = 0; i<LogLevel::LOGLEVEL_CATEGORIES; i++)
out << ll.getLogLevel((LogLevel::EventCategory)i) << " "; out << ll.getLogLevel((LogLevel::EventCategory)i) << " ";
out << "]"; out << "]";
return out;
} }
void void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment