Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

5 files changed, 14 insertions, 138 deletions

diff --git a/ndb/src/mgmsrv/CommandInterpreter.cpp b/ndb/src/mgmsrv/CommandInterpreter.cpp
index 02bf24f1d9c..1b882cd2e71 100644
--- a/ndb/src/mgmsrv/CommandInterpreter.cpp
+++ b/ndb/src/mgmsrv/CommandInterpreter.cpp
@@ -157,10 +157,6 @@ int CommandInterpreter::readAndExecute() {
     executeShow(allAfterFirstToken);
     return true;
   }
-  else if (strcmp(firstToken, "CLUSTERLOG") == 0) {
-    executeClusterLog(allAfterFirstToken);
-    return true;
-  }
   else if(strcmp(firstToken, "START") == 0 &&
 	  allAfterFirstToken != 0 &&
 	  strncmp(allAfterFirstToken, "BACKUP", sizeof("BACKUP") - 1) == 0){
@@ -472,130 +468,6 @@ void CommandInterpreter::executeShow(char* parameters) {
   }
 }
 
-
-//*****************************************************************************
-//*****************************************************************************
-void CommandInterpreter::executeClusterLog(char* parameters) {
-
-  if (parameters != 0 && strlen(parameters) != 0) {
-    int severity = 7;
-    int isOk = true;
-    char name[12]; 
-    bool noArgs = false;
-    
-    char * tmpString = strdup(parameters);
-    char * tmpPtr = 0;
-    char * item = strtok_r(tmpString, " ", &tmpPtr);
-    
-    /********************
-     * CLUSTERLOG FILTER 
-     ********************/
-    if (strcmp(item, "FILTER") == 0) {
-      
-      item = strtok_r(NULL, " ", &tmpPtr);
-      if (item == NULL) {
-	noArgs = true;
-      }
-      while (item != NULL) {
-	snprintf(name, 12, item);
-
-	if (strcmp(item, "ALL") == 0) {
-	  severity = 7;	
-	} else if (strcmp(item, "ALERT") == 0) {
-	  severity = 6;
-	} else if (strcmp(item, "CRITICAL") == 0) { 
-	  severity = 5;
-	} else if (strcmp(item, "ERROR") == 0) {
-	  severity = 4;
-	} else if (strcmp(item, "WARNING") == 0) {
-	  severity = 3;
-	} else if (strcmp(item, "INFO") == 0) {
-	  severity = 2;
-	} else if (strcmp(item, "DEBUG") == 0) {
-	  severity = 1;
-	} else if (strcmp(item, "OFF") == 0) {
-	  severity = 0;
-	} else {
-	  isOk = false;
-	}      
-	
-	item = strtok_r(NULL, " ", &tmpPtr);	
-      } //  while(item != NULL){
-      free(tmpString);
-
-      if (noArgs) {
-	ndbout << "Missing argument(s)." << endl;
-      } else if (isOk) {
-	if (_mgmtSrvr.setEventLogFilter(severity)) {
-	  if(strcmp(name, "ALL") == 0 || strcmp(name, "all") == 0) {
-	    ndbout << "All severities levels enabled." << endl;
-	  } else if(strcmp(name, "OFF") == 0 || strcmp(name, "off") == 0) {
-	    ndbout << "Cluster logging disabled." << endl;
-	  } else {
-	    ndbout << name << " events enabled." << endl;
-	  }
-	} else {
-	  if(strcmp(name, "ALL") == 0) {
-	    ndbout << "All severities levels disabled." << endl;
-	  } else if(strcmp(name, "OFF") == 0) {
-	    ndbout << "Cluster logging enabled." << endl;
-	  } else {
-	    ndbout << name << " events disabled." << endl;
-	  }
-	}      
-      } else {
-	ndbout << "Invalid severity level." << endl;
-      }
-
-    /********************
-     * CLUSTERLOG INFO
-     ********************/
-    } else if (strcmp(item, "INFO") == 0) {
-      const char* names[] = {"DEBUG", "INFO", "WARNING", "ERROR", 
-			     "CRITICAL", "ALERT"};
-      if (_mgmtSrvr.isEventLogFilterEnabled(0)) { // OFF
-	ndbout << "Cluster logging is disabled." << endl;
-      } 
-
-      ndbout << "Severities enabled: ";
-      for (int i = 0; i < 6; i++) {
-	if (_mgmtSrvr.isEventLogFilterEnabled(i + 1)) {
-	  ndbout << names[i] << " ";
-	}	
-      }
-      ndbout << endl;
-
-      /********************
-       * CLUSTERLOG OFF
-       ********************/
-    } else if (strcmp(item, "OFF") == 0) {
-      if (!_mgmtSrvr.isEventLogFilterEnabled(0)) { // ON
-	if (_mgmtSrvr.setEventLogFilter(0));
-	ndbout << "Cluster logging is disabled." << endl;	
-      } else {
-	ndbout << "Cluster logging is already disabled." << endl;	
-      }
-      
-      /********************
-       * CLUSTERLOG ON
-       ********************/
-    } else if (strcmp(item, "ON") == 0) {
-      if (_mgmtSrvr.isEventLogFilterEnabled(0)) { // OFF
-	if (_mgmtSrvr.setEventLogFilter(0));
-	ndbout << "Cluster logging is enabled." << endl;	
-      } else {
-	ndbout << "Cluster logging is already enabled." << endl;	
-      }
-
-    } else {
-      ndbout << "Invalid argument." << endl;
-    }
-
-  } else {
-    ndbout << "Missing argument." << endl;
-  }
-}
-
 void
 stopCallback(int nodeId, void * anyData, int errCode){
   if(errCode == 0){
diff --git a/ndb/src/mgmsrv/CommandInterpreter.hpp b/ndb/src/mgmsrv/CommandInterpreter.hpp
index 1a5184361d6..74e5c2e95be 100644
--- a/ndb/src/mgmsrv/CommandInterpreter.hpp
+++ b/ndb/src/mgmsrv/CommandInterpreter.hpp
@@ -125,7 +125,6 @@ private:
   void executeShow(char* parameters);
   void executeRun(char* parameters);
   void executeInfo(char* parameters);
-  void executeClusterLog(char* parameters);
 
 public:
   void executeStop(int processId, const char* parameters, bool all);
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 061aa2e0cb8..4a9bfac3b6c 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -226,7 +226,8 @@ MgmtSrvr::startEventLog()
 		   clusterLog);
   }
   if(!g_EventLogger.addHandler(logdest)) {
-    ndbout << "Warning: could not add log destination \"" << logdest.c_str() << "\"" << endl;
+    ndbout << "Warning: could not add log destination \""
+	   << logdest.c_str() << "\"" << endl;
   }
 }
 
@@ -244,18 +245,19 @@ public:
 };
 
 bool
-MgmtSrvr::setEventLogFilter(int severity) 
+MgmtSrvr::setEventLogFilter(int severity, int enable)
 {
-  bool enabled = true;
   Logger::LoggerLevel level = (Logger::LoggerLevel)severity;
-  if (g_EventLogger.isEnable(level)) {
+  if (enable > 0) {
+    g_EventLogger.enable(level);
+  } else if (enable == 0) {
+    g_EventLogger.disable(level);
+  } else if (g_EventLogger.isEnable(level)) {
     g_EventLogger.disable(level);
-    enabled = false;
   } else {
     g_EventLogger.enable(level);
   }
-
-  return enabled;
+  return g_EventLogger.isEnable(level);
 }
 
 bool 
diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/ndb/src/mgmsrv/MgmtSrvr.hpp
index 1afb0848ecc..4d5631d3eb6 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.hpp
@@ -122,7 +122,7 @@ public:
    * @param serverity the log level/serverity.
    * @return true if the severity was enabled.
    */
-  bool setEventLogFilter(int severity);
+  bool setEventLogFilter(int severity, int enable);
 
   /**
    * Returns true if the log level/severity is enabled.
diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index 9ee0203e454..6ba2663c335 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.cpp
@@ -218,6 +218,7 @@ ParserRow<MgmApiSession> commands[] = {
 
   MGM_CMD("set logfilter", &MgmApiSession::setLogFilter, ""),
     MGM_ARG("level", Int, Mandatory, "Severety level"),
+    MGM_ARG("enable", Int, Mandatory, "1=disable, 0=enable, -1=toggle"),
 
   MGM_CMD("config lock", &MgmApiSession::configLock, ""),
 
@@ -1203,10 +1204,12 @@ void
 MgmApiSession::setLogFilter(Parser_t::Context &ctx,
 			    const class Properties &args) {
   Uint32 level;
+  Uint32 enable;
 
   args.get("level", &level);
+  args.get("enable", &enable);
 
-  int result = m_mgmsrv.setEventLogFilter(level);
+  int result = m_mgmsrv.setEventLogFilter(level, enable);
 
   m_output->println("set logfilter reply");
   m_output->println("result: %d", result);