summaryrefslogtreecommitdiff
path: root/ndb/include
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2004-12-08 14:24:59 +0000
committerunknown <tomas@poseidon.ndb.mysql.com>2004-12-08 14:24:59 +0000
commitb89ef30962f3f5cc30c5a9cf6ea7ae4a034b48f0 (patch)
tree7da25434526279a81c69673b7c98af90021b36d4 /ndb/include
parent189f1938ff7354788765ba208937d1e7d157ae85 (diff)
downloadmariadb-git-b89ef30962f3f5cc30c5a9cf6ea7ae4a034b48f0.tar.gz
bug #7104
+ some extra debug printouts mysql-test/ndb/ndbcluster.sh: fixed debug flag in ndbcluster start script ndb/include/debugger/EventLogger.hpp: bug #7104 ndb/include/kernel/LogLevel.hpp: bug #7104 ndb/src/common/debugger/EventLogger.cpp: bug #7104 ndb/src/common/portlib/NdbTCP.cpp: removed debug printout in Ndb_getInAddr ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: bug #7104 ndb/src/mgmapi/mgmapi.cpp: bug #7104 ndb/src/mgmsrv/MgmtSrvr.cpp: bug #7104 ndb/src/mgmsrv/MgmtSrvr.hpp: bug #7104 ndb/src/mgmsrv/Services.cpp: bug #7104 ndb/src/ndbapi/TransporterFacade.cpp: bug #7104
Diffstat (limited to 'ndb/include')
-rw-r--r--ndb/include/debugger/EventLogger.hpp5
-rw-r--r--ndb/include/kernel/LogLevel.hpp12
2 files changed, 13 insertions, 4 deletions
diff --git a/ndb/include/debugger/EventLogger.hpp b/ndb/include/debugger/EventLogger.hpp
index 686989089ae..b82c823ee0b 100644
--- a/ndb/include/debugger/EventLogger.hpp
+++ b/ndb/include/debugger/EventLogger.hpp
@@ -48,6 +48,11 @@ public:
static const EventRepLogLevelMatrix matrix[];
static const Uint32 matrixSize;
+ static int
+ EventLoggerBase::event_lookup(int eventType,
+ LogLevel::EventCategory &cat,
+ Uint32 &threshold,
+ Logger::LoggerLevel &severity);
};
/**
diff --git a/ndb/include/kernel/LogLevel.hpp b/ndb/include/kernel/LogLevel.hpp
index 467f0604edd..0ff4386da8e 100644
--- a/ndb/include/kernel/LogLevel.hpp
+++ b/ndb/include/kernel/LogLevel.hpp
@@ -73,7 +73,7 @@ public:
/**
* Note level is valid as 0-15
*/
- void setLogLevel(EventCategory ec, Uint32 level = 7);
+ int setLogLevel(EventCategory ec, Uint32 level = 7);
/**
* Get the loglevel (0-15) for a category
@@ -119,10 +119,14 @@ LogLevel::clear(){
}
inline
-void
+int
LogLevel::setLogLevel(EventCategory ec, Uint32 level){
- assert(ec >= 0 && (Uint32) ec < LOGLEVEL_CATEGORIES);
- logLevelData[ec] = (Uint8)level;
+ if (ec >= 0 && (Uint32) ec < LOGLEVEL_CATEGORIES)
+ {
+ logLevelData[ec] = (Uint8)level;
+ return 0;
+ }
+ return 1;
}
inline