diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-12-13 11:45:45 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-12-13 11:45:45 +0100 |
| commit | be19c6f72109d8ffd3adbee84a1289ad05bcf14f (patch) | |
| tree | 3beae503fa9d5d26b598c4c611870a6f427a93d8 | |
| parent | a6c5e1105c4f80583ad8e4589116a9bcbd7d54fd (diff) | |
| download | mariadb-git-be19c6f72109d8ffd3adbee84a1289ad05bcf14f.tar.gz | |
bug #7230
+ fixed testcase
mysql-test/ndb/basic.result:
fixed testcase
ndb/include/debugger/EventLogger.hpp:
bug #7230
| -rw-r--r-- | mysql-test/ndb/basic.result | 5 | ||||
| -rw-r--r-- | ndb/include/debugger/EventLogger.hpp | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/ndb/basic.result b/mysql-test/ndb/basic.result index 6bd907a11d0..7049c02f304 100644 --- a/mysql-test/ndb/basic.result +++ b/mysql-test/ndb/basic.result @@ -6,9 +6,10 @@ HELP Print help text HELP SHOW Help for SHOW command HELP DEBUG Help for debug compiled version SHOW Print information about cluster -START BACKUP Start backup +START BACKUP [NOWAIT | WAIT STARTED | WAIT COMPLETED] + Start backup (default WAIT COMPLETED) ABORT BACKUP <backup id> Abort backup -SHUTDOWN Shutdown all processes in cluster and quit +SHUTDOWN Shutdown all processes in cluster CLUSTERLOG ON [<severity>] ... Enable Cluster logging CLUSTERLOG OFF [<severity>] ... Disable Cluster logging CLUSTERLOG TOGGLE [<severity>] ... Toggle severity filter on/off diff --git a/ndb/include/debugger/EventLogger.hpp b/ndb/include/debugger/EventLogger.hpp index b82c823ee0b..ddf21b79f5f 100644 --- a/ndb/include/debugger/EventLogger.hpp +++ b/ndb/include/debugger/EventLogger.hpp @@ -48,11 +48,10 @@ public: static const EventRepLogLevelMatrix matrix[]; static const Uint32 matrixSize; - static int - EventLoggerBase::event_lookup(int eventType, - LogLevel::EventCategory &cat, - Uint32 &threshold, - Logger::LoggerLevel &severity); + static int event_lookup(int eventType, + LogLevel::EventCategory &cat, + Uint32 &threshold, + Logger::LoggerLevel &severity); }; /** |