Moved event category match functionality into mgmapi

Removed grep introduced bogus mgm call


BitKeeper/deleted/.del-LogLevel.cpp~314a6bada2df40a8:
  Delete: ndb/src/common/debugger/LogLevel.cpp
ndb/include/debugger/EventLogger.hpp:
  Removed match functionality and put into mgmapi
ndb/include/kernel/LogLevel.hpp:
  Update LogLevel
ndb/include/mgmapi/mgmapi_config_parameters.h:
  fix parameter
ndb/src/common/debugger/EventLogger.cpp:
  Removed match functionality and put into mgmapi
ndb/src/common/debugger/Makefile.am:
  removed LogLevel.cpp
ndb/src/cw/cpcd/APIService.cpp:
  compiler warning
ndb/src/cw/cpcd/CPCD.cpp:
  compiler warning
ndb/src/cw/cpcd/CPCD.hpp:
  compiler warning
ndb/src/cw/cpcd/main.cpp:
  compiler warning
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Changed name of config parameter
ndb/src/kernel/vm/Configuration.cpp:
  Changed name of config parameter

4 files changed, 12 insertions, 12 deletions

diff --git a/ndb/src/cw/cpcd/APIService.cpp b/ndb/src/cw/cpcd/APIService.cpp
index 46b043c7004..de0e40cebfc 100644
--- a/ndb/src/cw/cpcd/APIService.cpp
+++ b/ndb/src/cw/cpcd/APIService.cpp
@@ -47,7 +47,7 @@
    ParserRow<CPCDAPISession>::IgnoreMinMax, \
    0, 0, \
    fun, \
-   desc }
+   desc, 0 }
 
 #define CPCD_ARG(name, type, opt, desc) \
  { name, \
@@ -58,7 +58,7 @@
    ParserRow<CPCDAPISession>::IgnoreMinMax, \
    0, 0, \
    0, \
-  desc }
+   desc, 0 }
 
 #define CPCD_ARG2(name, type, opt, min, max, desc) \
  { name, \
@@ -69,7 +69,7 @@
    ParserRow<CPCDAPISession>::IgnoreMinMax, \
    min, max, \
    0, \
-  desc }
+   desc, 0 }
 
 #define CPCD_END() \
  { 0, \
@@ -80,7 +80,7 @@
    ParserRow<CPCDAPISession>::IgnoreMinMax, \
    0, 0, \
    0, \
-   0 }
+   0, 0 }
 
 #define CPCD_CMD_ALIAS(name, realName, fun) \
  { name, \
@@ -91,7 +91,7 @@
    ParserRow<CPCDAPISession>::IgnoreMinMax, \
    0, 0, \
    0, \
-   0 }
+   0, 0 }
 
 #define CPCD_ARG_ALIAS(name, realName, fun) \
  { name, \
@@ -102,7 +102,7 @@
    ParserRow<CPCDAPISession>::IgnoreMinMax, \
    0, 0, \
    0, \
-   0 }
+   0, 0 }
 
 const
 ParserRow<CPCDAPISession> commands[] = 
diff --git a/ndb/src/cw/cpcd/CPCD.cpp b/ndb/src/cw/cpcd/CPCD.cpp
index 44db10422b9..bc9f350755f 100644
--- a/ndb/src/cw/cpcd/CPCD.cpp
+++ b/ndb/src/cw/cpcd/CPCD.cpp
@@ -378,7 +378,7 @@ CPCD::getProcessList() {
 }
 
 void
-CPCD::RequestStatus::err(enum RequestStatusCode status, char *msg) {
+CPCD::RequestStatus::err(enum RequestStatusCode status, const char *msg) {
   m_status = status;
   snprintf(m_errorstring, sizeof(m_errorstring), "%s", msg);
 }
diff --git a/ndb/src/cw/cpcd/CPCD.hpp b/ndb/src/cw/cpcd/CPCD.hpp
index 4a7cab23bab..a5c0bef1dac 100644
--- a/ndb/src/cw/cpcd/CPCD.hpp
+++ b/ndb/src/cw/cpcd/CPCD.hpp
@@ -91,7 +91,7 @@ public:
     RequestStatus() { m_status = OK; m_errorstring[0] = '\0'; };
 
     /** @brief Sets an errorcode and a printable message */
-    void err(enum RequestStatusCode, char *);
+    void err(enum RequestStatusCode, const char *);
 
     /** @brief Returns the error message */
     char *getErrMsg() { return m_errorstring; };
diff --git a/ndb/src/cw/cpcd/main.cpp b/ndb/src/cw/cpcd/main.cpp
index 913c31de1f7..207b81bfa89 100644
--- a/ndb/src/cw/cpcd/main.cpp
+++ b/ndb/src/cw/cpcd/main.cpp
@@ -28,12 +28,12 @@
 
 #include "common.hpp"
 
-static char *work_dir = CPCD_DEFAULT_WORK_DIR;
+static const char *work_dir = CPCD_DEFAULT_WORK_DIR;
 static int port = CPCD_DEFAULT_TCP_PORT;
 static int use_syslog = 0;
-static char *logfile = NULL;
-static char *config_file = CPCD_DEFAULT_CONFIG_FILE;
-static char *user = 0;
+static const char *logfile = NULL;
+static const char *config_file = CPCD_DEFAULT_CONFIG_FILE;
+static const char *user = 0;
 
 static struct getargs args[] = {
   { "work-dir", 'w', arg_string, &work_dir,