=== modified file 'interface/mgmapi/mgmenums.i'
--- a/interface/mgmapi/mgmenums.i	2008-04-22 21:58:36 +0000
+++ b/interface/mgmapi/mgmenums.i	2008-05-22 22:29:04 +0000
@@ -61,64 +61,6 @@
   NDB_MGM_NODE_STATUS_RESUME        = 8,
 };
 
-/**
- *    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,
-  /** 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,
-  /** Could not bind local address */
-  NDB_MGM_BIND_ADDRESS = 1012,
-
-  /* Alloc node id failures */
-  /** Generic error, retry may succeed */
-  NDB_MGM_ALLOCID_ERROR = 1101,
-  /** Non retriable error */
-  NDB_MGM_ALLOCID_CONFIG_MISMATCH = 1102,
-
-  /* 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
-};
-
 enum ndb_mgm_event_severity {
   NDB_MGM_ILLEGAL_EVENT_SEVERITY = -1,
   /*  Must be a nonnegative integer (used for array indexing) */

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2008-05-22 21:57:56 +0000
+++ b/java/Makefile.am	2008-05-22 22:29:04 +0000
@@ -39,7 +39,6 @@
 	${package_builddir}/mgmj/NdbLogEventManagerImpl.java \
 	${package_builddir}/mgmj/ClusterStateImpl.java \
 	${package_builddir}/mgmj/NdbMgmImpl.java \
-	${package_builddir}/mgmj/NdbMgmError.java \
 	${package_builddir}/mgmj/NdbMgmReplyImpl.java \
 	${package_builddir}/mgmj/NodeStateImpl.java \
 	${package_builddir}/mgmj/NodeStatus.java \
@@ -124,7 +123,7 @@
 # Files to remove to clean up after a rename
 DEPRECATED_FILES = ${package_builddir}/mgmj/NdbMgmEventSeverity.java \
 	${package_builddir}/mgmj/NdbMgmEventCategory.java
-CLEANFILES = $(BUILT_SOURCES) ${builddir}/*class ${builddir}/*log ${builddir}/ndbj.jar ${builddir}/mgmj.jar ${builddir}/*.h ${package_builddir}/ndbj/*class ${package_builddir}/mgmj/*class ${builddir}/testsuite/*class  ${builddir}/testsuite/ndbj/*class ${builddir}/testsuite/mgmj/*class ${package_builddir}/ndbj/examples/*class ${package_builddir}/ndbj/*Ref.java ${package_builddir}/mgmj/examples/*class $(DEPRECATED_FILES) ${package_builddir}/mgmj/events/*class ${package_builddir}/mgmj/listeners/*class  events.cxx listeners.cxx ${package_builddir}/mgmj/SWIG* ${package_builddir}/ndbj/SWIG* ${package_builddir}/mgmj/events/SWIG* ${package_builddir}/mgmj/listeners/SWIG* ${package_srcdir}/ndbj/InvalidSchemaObjectVersionException.java ${package_srcdir}/ndbj/NdbApiRuntimeException.java ${package_srcdir}/ndbj/NdbApiTimeStampOutOfBoundsException.java ${package_srcdir}/ndbj/NdbApiUserErrorPermanentException.java ${package_srcdir}/ndbj/NoSuchIndexException.java ${package_srcdir}/ndbj/NoSu!
 chColumnException.java ${package_srcdir}/ndbj/BlobUndefinedException.java ${package_srcdir}/ndbj/NdbClusterConnectionTemporaryException.java ${package_srcdir}/ndbj/NdbClusterConnectionPermanentException.java ${package_srcdir}/ndbj/NoSuchTableException.java 
+CLEANFILES = $(BUILT_SOURCES) ${builddir}/*class ${builddir}/*log ${builddir}/ndbj.jar ${builddir}/mgmj.jar ${builddir}/*.h ${package_builddir}/ndbj/*class ${package_builddir}/mgmj/*class ${builddir}/testsuite/*class  ${builddir}/testsuite/ndbj/*class ${builddir}/testsuite/mgmj/*class ${package_builddir}/ndbj/examples/*class ${package_builddir}/ndbj/*Ref.java ${package_builddir}/mgmj/examples/*class $(DEPRECATED_FILES) ${package_builddir}/mgmj/events/*class ${package_builddir}/mgmj/listeners/*class  events.cxx listeners.cxx ${package_builddir}/mgmj/SWIG* ${package_builddir}/ndbj/SWIG* ${package_builddir}/mgmj/events/SWIG* ${package_builddir}/mgmj/listeners/SWIG* ${package_srcdir}/ndbj/InvalidSchemaObjectVersionException.java ${package_srcdir}/ndbj/NdbApiRuntimeException.java ${package_srcdir}/ndbj/NdbApiTimeStampOutOfBoundsException.java ${package_srcdir}/ndbj/NdbApiUserErrorPermanentException.java ${package_srcdir}/ndbj/NoSuchIndexException.java ${package_srcdir}/ndbj/NoSu!
 chColumnException.java ${package_srcdir}/ndbj/BlobUndefinedException.java ${package_srcdir}/ndbj/NdbClusterConnectionTemporaryException.java ${package_srcdir}/ndbj/NdbClusterConnectionPermanentException.java ${package_srcdir}/ndbj/NoSuchTableException.java  ${package_srcdir}/mgmj/NdbMgmError.java
 
 MGMAPI_JAVA_SRC = ${package_srcdir}/mgmj/NdbMgmException.java \
 	${package_srcdir}/mgmj/IllegalConnectString.java \
@@ -372,7 +371,6 @@
 	${package_builddir}/mgmj/NdbMgmImpl.class \
 	${package_builddir}/mgmj/NdbMgmFactory.class \
 	${package_builddir}/mgmj/NdbMgm.class \
-	${package_builddir}/mgmj/NdbMgmError.class \
 	${package_builddir}/mgmj/NdbMgmReply.class \
 	${package_builddir}/mgmj/NdbMgmReplyImpl.class \
 	${package_builddir}/mgmj/NodeState.class \