From: Date: December 18 2008 10:16am Subject: bzr commit into mysql-5.1 branch (jonas:2778) Bug#27004 List-Archive: http://lists.mysql.com/commits/61941 X-Bug: 27004 Message-Id: <20081218091654.A2BCB715B50@perch.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/jonas/src/telco-6.2/ 2778 Jonas Oreland 2008-12-18 ndb - bug#27004 - mgmapi does not compile to pure c modified: storage/ndb/include/mgmapi/mgmapi.h storage/ndb/include/mgmapi/mgmapi_config_parameters.h storage/ndb/include/mgmapi/mgmapi_error.h storage/ndb/include/mgmapi/ndb_logevent.h storage/ndb/src/mgmapi/mgmapi.cpp === modified file 'storage/ndb/include/mgmapi/mgmapi.h' --- a/storage/ndb/include/mgmapi/mgmapi.h 2008-11-20 16:41:06 +0000 +++ b/storage/ndb/include/mgmapi/mgmapi.h 2008-12-18 09:16:45 +0000 @@ -1191,23 +1191,23 @@ extern "C" { NDB_MGM_CLUSTERLOG_ALERT = 6, NDB_MGM_CLUSTERLOG_ALL = 7 }; - inline + static inline 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,(enum ndb_mgm_event_severity)s, e,r); } - inline + static inline const unsigned int * ndb_mgm_get_logfilter(NdbMgmHandle h) { return ndb_mgm_get_clusterlog_severity_filter_old(h); } - inline + static inline int ndb_mgm_set_loglevel_clusterlog(NdbMgmHandle h, int n, enum ndb_mgm_event_category c, int l, struct ndb_mgm_reply* r) { return ndb_mgm_set_clusterlog_loglevel(h,n,c,l,r); } - inline + static inline const unsigned int * ndb_mgm_get_loglevel_clusterlog(NdbMgmHandle h) { return ndb_mgm_get_clusterlog_loglevel_old(h); } === modified file 'storage/ndb/include/mgmapi/mgmapi_config_parameters.h' --- a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h 2008-05-29 13:09:49 +0000 +++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h 2008-12-18 09:16:45 +0000 @@ -191,9 +191,9 @@ #define CFG_SCI_SEND_LIMIT 554 #define CFG_SCI_BUFFER_MEM 555 -#define CFG_602 602 // Removed: was OSE -#define CFG_603 603 // Removed: was OSE -#define CFG_604 604 // Removed: was OSE +#define CFG_602 602 /* Removed: was OSE */ +#define CFG_603 603 /* Removed: was OSE */ +#define CFG_604 604 /* Removed: was OSE */ /** * API Config variables @@ -220,6 +220,6 @@ #define CONNECTION_TYPE_TCP 0 #define CONNECTION_TYPE_SHM 1 #define CONNECTION_TYPE_SCI 2 -#define CONNECTION_TYPE_OSE 3 // Removed. +#define CONNECTION_TYPE_OSE 3 /* Removed. */ #endif === modified file 'storage/ndb/include/mgmapi/mgmapi_error.h' --- a/storage/ndb/include/mgmapi/mgmapi_error.h 2008-03-28 08:03:06 +0000 +++ b/storage/ndb/include/mgmapi/mgmapi_error.h 2008-12-18 09:16:45 +0000 @@ -81,40 +81,8 @@ extern "C" { enum ndb_mgm_error code; const char * msg; }; - const struct Ndb_Mgm_Error_Msg ndb_mgm_error_msgs[] = { - { NDB_MGM_NO_ERROR, "No error" }, - - /* Request for service errors */ - { NDB_MGM_ILLEGAL_CONNECT_STRING, "Illegal connect string" }, - { 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" }, - { NDB_MGM_ILLEGAL_NODE_STATUS, "Illegal node status" }, - { NDB_MGM_OUT_OF_MEMORY, "Out of memory" }, - { NDB_MGM_SERVER_NOT_CONNECTED, "Management server not connected" }, - { NDB_MGM_COULD_NOT_CONNECT_TO_SOCKET, "Could not connect to socket" }, - - /* Service errors - Start/Stop Node or System */ - { NDB_MGM_START_FAILED, "Start failed" }, - { NDB_MGM_STOP_FAILED, "Stop failed" }, - { NDB_MGM_RESTART_FAILED, "Restart failed" }, - - /* Service errors - Backup */ - { NDB_MGM_COULD_NOT_START_BACKUP, "Could not start backup" }, - { NDB_MGM_COULD_NOT_ABORT_BACKUP, "Could not abort backup" }, - - /* Service errors - Single User Mode */ - { NDB_MGM_COULD_NOT_ENTER_SINGLE_USER_MODE, - "Could not enter single user mode" }, - { NDB_MGM_COULD_NOT_EXIT_SINGLE_USER_MODE, - "Could not exit single user mode" }, - - /* Usage errors */ - { NDB_MGM_USAGE_ERROR, - "Usage error" } - }; - const int ndb_mgm_noOfErrorMsgs = - sizeof(ndb_mgm_error_msgs)/sizeof(struct Ndb_Mgm_Error_Msg); + extern const struct Ndb_Mgm_Error_Msg ndb_mgm_error_msgs[]; + extern const int ndb_mgm_noOfErrorMsgs; #endif #ifdef __cplusplus === modified file 'storage/ndb/include/mgmapi/ndb_logevent.h' --- a/storage/ndb/include/mgmapi/ndb_logevent.h 2008-02-11 14:07:49 +0000 +++ b/storage/ndb/include/mgmapi/ndb_logevent.h 2008-12-18 09:16:45 +0000 @@ -393,6 +393,7 @@ extern "C" { } NDBStartCompleted; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { + unsigned _todo; } STTORRYRecieved; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { @@ -437,6 +438,7 @@ extern "C" { } NDBStopForced; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { + unsigned _todo; } NDBStopAborted; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { @@ -470,9 +472,11 @@ extern "C" { /* NODERESTART */ /** Log event specific data for for corresponding NDB_LE_ log event */ struct { + unsigned _todo; } NR_CopyDict; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { + unsigned _todo; } NR_CopyDistr; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { @@ -518,12 +522,15 @@ extern "C" { } ArbitResult; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { + unsigned _todo; } GCP_TakeoverStarted; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { + unsigned _todo; } GCP_TakeoverCompleted; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { + unsigned _todo; } LCP_TakeoverStarted; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { @@ -604,6 +611,7 @@ extern "C" { /** Log event specific data for for corresponding NDB_LE_ log event */ struct { /* TODO */ + unsigned _todo; } WarningEvent; /* INFO */ @@ -618,6 +626,7 @@ extern "C" { /** Log event specific data for for corresponding NDB_LE_ log event */ struct { /* TODO */ + unsigned _todo; } InfoEvent; /** Log event specific data for for corresponding NDB_LE_ log event */ struct { === modified file 'storage/ndb/src/mgmapi/mgmapi.cpp' --- a/storage/ndb/src/mgmapi/mgmapi.cpp 2008-10-31 13:55:33 +0000 +++ b/storage/ndb/src/mgmapi/mgmapi.cpp 2008-12-18 09:16:45 +0000 @@ -2920,4 +2920,41 @@ err: DBUG_RETURN(retval); } +extern "C" const struct Ndb_Mgm_Error_Msg ndb_mgm_error_msgs[] = +{ + { NDB_MGM_NO_ERROR, "No error" }, + + /* Request for service errors */ + { NDB_MGM_ILLEGAL_CONNECT_STRING, "Illegal connect string" }, + { 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" }, + { NDB_MGM_ILLEGAL_NODE_STATUS, "Illegal node status" }, + { NDB_MGM_OUT_OF_MEMORY, "Out of memory" }, + { NDB_MGM_SERVER_NOT_CONNECTED, "Management server not connected" }, + { NDB_MGM_COULD_NOT_CONNECT_TO_SOCKET, "Could not connect to socket" }, + + /* Service errors - Start/Stop Node or System */ + { NDB_MGM_START_FAILED, "Start failed" }, + { NDB_MGM_STOP_FAILED, "Stop failed" }, + { NDB_MGM_RESTART_FAILED, "Restart failed" }, + + /* Service errors - Backup */ + { NDB_MGM_COULD_NOT_START_BACKUP, "Could not start backup" }, + { NDB_MGM_COULD_NOT_ABORT_BACKUP, "Could not abort backup" }, + + /* Service errors - Single User Mode */ + { NDB_MGM_COULD_NOT_ENTER_SINGLE_USER_MODE, + "Could not enter single user mode" }, + { NDB_MGM_COULD_NOT_EXIT_SINGLE_USER_MODE, + "Could not exit single user mode" }, + + /* Usage errors */ + { NDB_MGM_USAGE_ERROR, + "Usage error" } +}; + +extern "C" const int ndb_mgm_noOfErrorMsgs = + sizeof(ndb_mgm_error_msgs)/sizeof(struct Ndb_Mgm_Error_Msg); + template class Vector*>;