MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Stewart Smith Date:February 14 2007 4:47am
Subject:bk commit into 5.0 tree (stewart:1.2409) BUG#26355
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-14 15:47:34+11:00, stewart@willster.(none) +2 -0
  BUG#26355  	FIXME: use constant for max loglevel in ndb_mgmd

  ndb/include/mgmapi/mgmapi.h@stripped, 2007-02-14 15:47:33+11:00, stewart@willster.(none) +2 -0
    use constant for max log level in ndb_mgmd.
    
    (more useful in 5.1 due to other defines and refinements of mgmapi)

  ndb/src/mgmsrv/Services.cpp@stripped, 2007-02-14 15:47:33+11:00, stewart@willster.(none) +3 -5
    fix the XXX fixme of constant for max log level

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/ndb-work

--- 1.54/ndb/include/mgmapi/mgmapi.h	2007-01-23 17:06:24 +11:00
+++ 1.55/ndb/include/mgmapi/mgmapi.h	2007-02-14 15:47:33 +11:00
@@ -16,6 +16,8 @@
 #ifndef MGMAPI_H
 #define MGMAPI_H
 
+#define NDB_MGM_MAX_LOGLEVEL 15
+
 /**
  * @mainpage MySQL Cluster Management API
  *

--- 1.74/ndb/src/mgmsrv/Services.cpp	2007-02-14 15:35:27 +11:00
+++ 1.75/ndb/src/mgmsrv/Services.cpp	2007-02-14 15:47:33 +11:00
@@ -764,8 +764,7 @@
 
   DBUG_PRINT("enter",("node=%d, category=%d, level=%d", node, cat, level));
 
-  /* XXX should use constants for this value */
-  if(level > 15) {
+  if(level > NDB_MGM_MAX_LOGLEVEL) {
     m_output->println(reply);
     m_output->println("result: Invalid loglevel %d", level);
     m_output->println("");
@@ -809,8 +808,7 @@
   args.get("category", &cat);
   args.get("level", &level);
 
-  /* XXX should use constants for this value */
-  if(level > 15) {
+  if(level > NDB_MGM_MAX_LOGLEVEL) {
     m_output->println("set loglevel reply");
     m_output->println("result: Invalid loglevel", errorString.c_str());
     m_output->println("");
@@ -1510,7 +1508,7 @@
     }
     
     int level = atoi(spec[1].c_str());
-    if(level < 0 || level > 15){
+    if(level < 0 || level > NDB_MGM_MAX_LOGLEVEL){
       msg.appfmt("Invalid level: >%s<", spec[1].c_str());
       result = -1;
       goto done;
Thread
bk commit into 5.0 tree (stewart:1.2409) BUG#26355Stewart Smith14 Feb