Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

ndb/include/mgmapi/mgmapi.h

@@ -123,35 +123,49 @@ extern "C" {
    *    Error codes
    */
   enum ndb_mgm_error {
+    /** Not an error */
     NDB_MGM_NO_ERROR = 0,
 
     /* Request for service errors */
+    /** Supplied connectstring is illegal */
     NDB_MGM_ILLEGAL_CONNECT_STRING = 1001,
-    NDB_MGM_ILLEGAL_PORT_NUMBER = 1002,
-    NDB_MGM_ILLEGAL_SOCKET = 1003,
-    NDB_MGM_ILLEGAL_IP_ADDRESS = 1004,
+    /** Supplied NdbMgmHandle is illegal */
     NDB_MGM_ILLEGAL_SERVER_HANDLE = 1005,
+    /** Illegal reply from server */
     NDB_MGM_ILLEGAL_SERVER_REPLY = 1006,
+    /** Illegal number of nodes */
     NDB_MGM_ILLEGAL_NUMBER_OF_NODES = 1007,
+    /** Illegal node status */
     NDB_MGM_ILLEGAL_NODE_STATUS = 1008,
+    /** Memory allocation error */
     NDB_MGM_OUT_OF_MEMORY = 1009,
+    /** Management server not connected */
     NDB_MGM_SERVER_NOT_CONNECTED = 1010,
+    /** Could not connect to socker */
     NDB_MGM_COULD_NOT_CONNECT_TO_SOCKET = 1011,
 
     /* Service errors - Start/Stop Node or System */
+    /** Start failed */
     NDB_MGM_START_FAILED = 2001,
+    /** Stop failed */
     NDB_MGM_STOP_FAILED = 2002,
+    /** Restart failed */
     NDB_MGM_RESTART_FAILED = 2003,
 
     /* Service errors - Backup */
+    /** Unable to start backup */
     NDB_MGM_COULD_NOT_START_BACKUP = 3001,
+    /** Unable to abort backup */
     NDB_MGM_COULD_NOT_ABORT_BACKUP = 3002,
 
     /* Service errors - Single User Mode */
+    /** Unable to enter single user mode */
     NDB_MGM_COULD_NOT_ENTER_SINGLE_USER_MODE = 4001,
+    /** Unable to exit single user mode */
     NDB_MGM_COULD_NOT_EXIT_SINGLE_USER_MODE = 4002,
 
     /* Usage errors */
+    /** Usage error */
     NDB_MGM_USAGE_ERROR = 5001
   };
 
@@ -165,9 +179,6 @@ extern "C" {
 
     /* Request for service errors */
     { NDB_MGM_ILLEGAL_CONNECT_STRING, "Illegal connect string" },
-    { NDB_MGM_ILLEGAL_PORT_NUMBER, "Illegal port number" },
-    { NDB_MGM_ILLEGAL_SOCKET, "Illegal socket" },
-    { NDB_MGM_ILLEGAL_IP_ADDRESS, "Illegal IP address" },
     { NDB_MGM_ILLEGAL_SERVER_HANDLE, "Illegal server handle" },
     { NDB_MGM_ILLEGAL_SERVER_REPLY, "Illegal reply from server" },
     { NDB_MGM_ILLEGAL_NUMBER_OF_NODES, "Illegal number of nodes" },