List:Internals« Previous MessageNext Message »
From:tomas Date:December 13 2004 10:45am
Subject:bk commit into 4.1 tree (tomas:1.2157)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2157 04/12/13 11:45:45 tomas@stripped +2 -0
  bug #7230
  + fixed testcase

  ndb/include/debugger/EventLogger.hpp
    1.7 04/12/13 11:45:42 tomas@stripped +4 -5
    bug #7230

  mysql-test/ndb/basic.result
    1.2 04/12/13 11:45:42 tomas@stripped +3 -2
    fixed testcase

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-4.1-clean

--- 1.6/ndb/include/debugger/EventLogger.hpp	2004-12-08 15:24:55 +01:00
+++ 1.7/ndb/include/debugger/EventLogger.hpp	2004-12-13 11:45:42 +01:00
@@ -48,11 +48,10 @@
 
   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);
 };
 
 /**

--- 1.1/mysql-test/ndb/basic.result	2004-12-08 22:47:36 +01:00
+++ 1.2/mysql-test/ndb/basic.result	2004-12-13 11:45:42 +01:00
@@ -6,9 +6,10 @@
 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
Thread
bk commit into 4.1 tree (tomas:1.2157)tomas13 Dec