bk commit into 5.1 tree (mtaylor:1.2551) BUG#27004

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor.  When mtaylor 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, 2008-03-28 09:03:06+01:00, mtaylor@solace.(none) +2 -0
  BUG#27004 mgmapi doesn't compile into C-code
      
  Merged Jan's patch into mysql-5.1-new-ndb

  storage/ndb/include/mgmapi/mgmapi.h@stripped, 2008-03-28 09:03:04+01:00,
mtaylor@solace.(none) +13 -12
    BUG#27004 mgmapi doesn't compile into C-code
        
    Merged Jan's patch into mysql-5.1-new-ndb

  storage/ndb/include/mgmapi/mgmapi_error.h@stripped, 2008-03-28 09:03:04+01:00,
mtaylor@solace.(none) +3 -0
    BUG#27004 mgmapi doesn't compile into C-code
        
    Merged Jan's patch into mysql-5.1-new-ndb

diff -Nrup a/storage/ndb/include/mgmapi/mgmapi.h b/storage/ndb/include/mgmapi/mgmapi.h
--- a/storage/ndb/include/mgmapi/mgmapi.h	2008-03-13 14:39:14 +01:00
+++ b/storage/ndb/include/mgmapi/mgmapi.h	2008-03-28 09:03:04 +01:00
@@ -311,6 +311,17 @@ extern "C" {
   };
 #endif
 
+  struct ndb_mgm_severity {
+    enum ndb_mgm_event_severity category;
+    unsigned int value;
+  };
+
+  struct ndb_mgm_loglevel {
+    enum ndb_mgm_event_category category;
+    unsigned int value;
+  };
+
+
   /***************************************************************************/
   /**
    * @name Functions: Error Handling
@@ -593,7 +604,7 @@ extern "C" {
   const char * ndb_mgm_get_node_status_string(enum ndb_mgm_node_status status);
 
   const char * ndb_mgm_get_event_severity_string(enum ndb_mgm_event_severity);
-  ndb_mgm_event_category ndb_mgm_match_event_category(const char *);
+  enum ndb_mgm_event_category ndb_mgm_match_event_category(const char *);
   const char * ndb_mgm_get_event_category_string(enum ndb_mgm_event_category);
 #endif
 
@@ -1167,13 +1178,8 @@ extern "C" {
   int ndb_mgm_filter_clusterlog(NdbMgmHandle h,
 				enum ndb_mgm_clusterlog_level s,
 				int e, struct ndb_mgm_reply* r)
-  { return ndb_mgm_set_clusterlog_severity_filter(h,(ndb_mgm_event_severity)s,
+  { return ndb_mgm_set_clusterlog_severity_filter(h,(enum ndb_mgm_event_severity)s,
 						  e,r); }
-  struct ndb_mgm_severity {
-    enum ndb_mgm_event_severity category;
-    unsigned int value;
-  };
-  
   inline
   const unsigned int * ndb_mgm_get_logfilter(NdbMgmHandle h)
   { return ndb_mgm_get_clusterlog_severity_filter_old(h); }
@@ -1183,11 +1189,6 @@ extern "C" {
 				      enum ndb_mgm_event_category c,
 				      int l, struct ndb_mgm_reply* r)
   { return ndb_mgm_set_clusterlog_loglevel(h,n,c,l,r); }
-
-  struct ndb_mgm_loglevel {
-    enum ndb_mgm_event_category category;
-    unsigned int value;
-  };
 
   inline
   const unsigned int * ndb_mgm_get_loglevel_clusterlog(NdbMgmHandle h)
diff -Nrup a/storage/ndb/include/mgmapi/mgmapi_error.h
b/storage/ndb/include/mgmapi/mgmapi_error.h
--- a/storage/ndb/include/mgmapi/mgmapi_error.h	2007-06-14 12:35:33 +02:00
+++ b/storage/ndb/include/mgmapi/mgmapi_error.h	2008-03-28 09:03:04 +01:00
@@ -76,6 +76,7 @@ extern "C" {
     /** Usage error */
     NDB_MGM_USAGE_ERROR = 5001
   };
+#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
   struct Ndb_Mgm_Error_Msg {
     enum ndb_mgm_error  code;
     const char *        msg;
@@ -114,6 +115,8 @@ extern "C" {
   };
   const int ndb_mgm_noOfErrorMsgs =
   sizeof(ndb_mgm_error_msgs)/sizeof(struct Ndb_Mgm_Error_Msg);
+#endif
+
 #ifdef __cplusplus
 }
 #endif