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

3 files changed, 1 insertions, 86 deletions

diff --git a/ndb/src/common/debugger/EventLogger.cpp b/ndb/src/common/debugger/EventLogger.cpp
index 2e818c04e02..bd066e65c94 100644
--- a/ndb/src/common/debugger/EventLogger.cpp
+++ b/ndb/src/common/debugger/EventLogger.cpp
@@ -113,26 +113,6 @@ const EventLoggerBase::EventRepLogLevelMatrix EventLoggerBase::matrix[] = {
 const Uint32 EventLoggerBase::matrixSize = sizeof(EventLoggerBase::matrix)/
                                        sizeof(EventRepLogLevelMatrix);
 
-/**
- * Specifies allowed event categories/log levels that can be set from
- * the Management API/interactive shell.
- */
-const EventLoggerBase::EventCategoryName 
-EventLoggerBase::eventCategoryNames[] = {
-  { LogLevel::llStartUp,     "STARTUP"     },
-  { LogLevel::llStatistic,   "STATISTICS"  },
-  { LogLevel::llCheckpoint,  "CHECKPOINT"  },
-  { LogLevel::llNodeRestart, "NODERESTART" },
-  { LogLevel::llConnection,  "CONNECTION"  },
-  { LogLevel::llInfo,        "INFO"        },
-  { LogLevel::llGrep,        "GREP"        }
-};
-
-const Uint32 
-EventLoggerBase::noOfEventCategoryNames = 
-  sizeof(EventLoggerBase::eventCategoryNames)/
-  sizeof(EventLoggerBase::EventCategoryName);
-
 const char*
 EventLogger::getText(char * m_text, size_t m_text_len, 
 		     int type,
@@ -1287,41 +1267,6 @@ EventLogger::getText(char * m_text, size_t m_text_len,
   return m_text;
 }
 
-bool
-EventLoggerBase::matchEventCategory(const char * str, 
-				LogLevel::EventCategory * cat,
-				bool exactMatch){
-  unsigned i;
-  if(cat == 0 || str == 0)
-    return false;
-
-  char * tmp = strdup(str);
-  for(i = 0; i<strlen(tmp); i++)
-    tmp[i] = toupper(tmp[i]);
-  
-  for(i = 0; i<noOfEventCategoryNames; i++){
-    if(strcmp(tmp, eventCategoryNames[i].name) == 0){
-      * cat = eventCategoryNames[i].category;
-      free(tmp);
-      return true;
-    }
-  }
-  free(tmp);
-  return false;
-}
-
-const char *
-EventLoggerBase::getEventCategoryName(LogLevel::EventCategory cat){
-  
-  for(unsigned i = 0; i<noOfEventCategoryNames; i++){
-    if(cat == eventCategoryNames[i].category){
-      return eventCategoryNames[i].name;
-    }
-  }
-  return 0;
-}
-
-
 EventLogger::EventLogger() : m_filterLevel(15)
 {
   setCategory("EventLogger");
diff --git a/ndb/src/common/debugger/LogLevel.cpp b/ndb/src/common/debugger/LogLevel.cpp
deleted file mode 100644
index f9e2f318432..00000000000
--- a/ndb/src/common/debugger/LogLevel.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#include <LogLevel.hpp>
-
-const LogLevel::LogLevelCategoryName LogLevel::LOGLEVEL_CATEGORY_NAME[] = {
-  { "LogLevelStartup" },
-  { "LogLevelShutdown" },
-  { "LogLevelStatistic" },
-  { "LogLevelCheckpoint" },
-  { "LogLevelNodeRestart" },
-  { "LogLevelConnection" },
-  { "LogLevelError" },
-  { "LogLevelWarning" },
-  { "LogLevelInfo" },
-  { "LogLevelGrep" }
-};
diff --git a/ndb/src/common/debugger/Makefile.am b/ndb/src/common/debugger/Makefile.am
index 0278d0d2ba0..d0fb30717cd 100644
--- a/ndb/src/common/debugger/Makefile.am
+++ b/ndb/src/common/debugger/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = signaldata
 
 noinst_LTLIBRARIES = libtrace.la
 
-libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp LogLevel.cpp EventLogger.cpp GrepError.cpp
+libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp EventLogger.cpp GrepError.cpp
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_kernel.mk.am