Add mgmapi

configure.in

@@ -2878,6 +2878,7 @@ AC_SUBST(mgmapiincludedir)
 	-I\$(top_srcdir)/ndb/include/kernel \
 	-I\$(top_srcdir)/ndb/include/transporter \
 	-I\$(top_srcdir)/ndb/include/debugger \
+	-I\$(top_srcdir)/ndb/include/mgmapi \
 	-I\$(top_srcdir)/ndb/include/mgmcommon \
         -I\$(top_srcdir)/ndb/include/ndbapi \
         -I\$(top_srcdir)/ndb/include/util \
@@ -2888,6 +2889,7 @@ AC_SUBST(mgmapiincludedir)
 	-I\$(top_srcdir)/ndb/include/kernel \
 	-I\$(top_srcdir)/ndb/include/transporter \
 	-I\$(top_srcdir)/ndb/include/debugger \
+	-I\$(top_srcdir)/ndb/include/mgmapi \
 	-I\$(top_srcdir)/ndb/include/mgmcommon \
         -I\$(top_srcdir)/ndb/include/ndbapi \
         -I\$(top_srcdir)/ndb/include/util \

ndb/src/common/debugger/signaldata/Makefile.am

@@ -23,7 +23,7 @@ libsignaldataprint_la_SOURCES = \
           FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp \
           SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp \
 	  UtilLock.cpp TuxMaint.cpp TupAccess.cpp AccLock.cpp \
-          LqhTrans.cpp
+          LqhTrans.cpp ReadNodesConf.cpp CntrStart.cpp
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_ndbapi.mk.am

ndb/src/common/mgmcommon/Makefile.am

@@ -8,6 +8,8 @@ libmgmsrvcommon_la_SOURCES = \
 	InitConfigFileParser.cpp \
 	IPCConfig.cpp NdbConfig.c
 
+INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
+
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
 include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am

ndb/src/common/util/Makefile.am

@@ -7,7 +7,8 @@ libgeneral_la_SOURCES = \
 	    OutputStream.cpp NdbOut.cpp BaseString.cpp Base64.cpp \
 	    NdbSqlUtil.cpp new.cpp \
             uucode.c random.c getarg.c version.c \
-            strdup.c strlcat.c strlcpy.c
+            strdup.c strlcat.c strlcpy.c \
+            ConfigValues.cpp
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_util.mk.am

ndb/src/kernel/ndb-main/Makefile.am

@@ -24,7 +24,6 @@ INCLUDES += \
               -I../blocks/dbtux
 
 LDADD +=  \
-              $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
               ../blocks/cmvmi/libcmvmi.a \
               ../blocks/dbacc/libdbacc.a \
               ../blocks/dbdict/libdbdict.a \
@@ -47,6 +46,7 @@ LDADD +=  \
               $(top_srcdir)/ndb/src/common/debugger/libtrace.la     \
               $(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
               $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+              $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
               $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la      \
               $(top_srcdir)/ndb/src/common/logger/liblogger.la       \
               $(top_srcdir)/ndb/src/common/util/libgeneral.la 

ndb/src/kernel/vm/Makefile.am

@@ -14,13 +14,14 @@ libkernel_a_SOURCES = \
 	TransporterCallback.cpp \
 	Emulator.cpp		\
 	Configuration.cpp		\
-	ClusterConfiguration.cpp	\
 	WatchDog.cpp \
         SimplePropertiesSection.cpp \
         SectionReader.cpp \
 	MetaData.cpp \
         Mutex.cpp SafeCounter.cpp
 
+INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
+
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_kernel.mk.am
 

ndb/src/mgmapi/Makefile.am

 
 ndblib_LTLIBRARIES = libmgmapi.la libMGM_API.la
 
-libmgmapi_la_SOURCES_loc = mgmapi.cpp
+libmgmapi_la_SOURCES_loc = mgmapi.cpp mgmapi_configuration.cpp
 
 libmgmapi_la_SOURCES = $(libmgmapi_la_SOURCES_loc)
 libMGM_API_la_SOURCES = $(libmgmapi_la_SOURCES_loc)

ndb/src/mgmclient/Makefile.am

@@ -14,8 +14,8 @@ LDADD += \
 	$(top_srcdir)/ndb/src/common/debugger/libtrace.la \
 	$(top_srcdir)/ndb/src/common/logger/liblogger.la \
 	$(top_srcdir)/ndb/src/common/util/libgeneral.la \
-	$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
 	$(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+	$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
 	$(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \
 	$(top_srcdir)/ndb/src/common/editline/libeditline.a
 

ndb/src/mgmsrv/Makefile.am

@@ -13,7 +13,7 @@ mgmtsrvr_SOURCES = \
 	MgmtSrvrConfig.cpp \
 	CommandInterpreter.cpp
 
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
+INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/src/mgmapi
 
 LDADD_LOC = \
 	$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \

ndb/src/ndbapi/Makefile.am

@@ -21,10 +21,9 @@ libndbapi_la_SOURCES_loc = \
         NdbOperationInt.cpp     \
         NdbOperationDefine.cpp  \
         NdbOperationExec.cpp    \
-        NdbScanReceiver.cpp     \
         NdbResultSet.cpp        \
         NdbCursorOperation.cpp  \
-        NdbScanOperation.cpp    NdbScanFilter.cpp \
+        NdbScanReceiver.cpp NdbScanOperation.cpp    NdbScanFilter.cpp \
         NdbIndexOperation.cpp   \
         NdbEventOperation.cpp   \
         NdbEventOperationImpl.cpp   \
@@ -39,6 +38,8 @@ libndbapi_la_SOURCES_loc = \
 libndbapi_la_SOURCES = $(libndbapi_la_SOURCES_loc)
 libNDB_API_la_SOURCES = $(libndbapi_la_SOURCES_loc)
 
+INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
+
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
 
@@ -47,6 +48,7 @@ libNDB_API_la_LIBADD =  \
               $(top_srcdir)/ndb/src/common/debugger/libtrace.la     \
               $(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
               $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+              $(top_srcdir)/ndb/src/mgmapi/libMGM_API.la \
               $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la      \
               $(top_srcdir)/ndb/src/common/logger/liblogger.la       \
               $(top_srcdir)/ndb/src/common/util/libgeneral.la

ndb/test/src/Makefile.am

@@ -10,9 +10,10 @@ libNDBT_a_SOURCES = \
 	NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \
 	NdbBackup.cpp  NdbConfig.cpp NdbGrep.cpp NDBT_Table.cpp
 
+INCLUDES_LOC = -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/include/mgmcommon -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/src/mgmapi
+
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
-INCLUDES += -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/include/mgmcommon -I$(top_srcdir)/ndb/include/kernel
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%