Commit 6926eeee authored by unknown's avatar unknown

Add mgmapi


configure.in:
  Added include of mgmapi
ndb/src/common/debugger/signaldata/Makefile.am:
  New files
ndb/src/common/util/Makefile.am:
  Add files
ndb/src/kernel/ndb-main/Makefile.am:
  Use mgmapi
ndb/src/kernel/vm/Makefile.am:
  Use mgmapi
ndb/src/mgmapi/Makefile.am:
  new files
ndb/src/mgmclient/Makefile.am:
  use mgmapi
ndb/src/mgmsrv/Makefile.am:
  use mgmapi
parent 0aee1b0a
...@@ -2878,6 +2878,7 @@ AC_SUBST(mgmapiincludedir) ...@@ -2878,6 +2878,7 @@ AC_SUBST(mgmapiincludedir)
-I\$(top_srcdir)/ndb/include/kernel \ -I\$(top_srcdir)/ndb/include/kernel \
-I\$(top_srcdir)/ndb/include/transporter \ -I\$(top_srcdir)/ndb/include/transporter \
-I\$(top_srcdir)/ndb/include/debugger \ -I\$(top_srcdir)/ndb/include/debugger \
-I\$(top_srcdir)/ndb/include/mgmapi \
-I\$(top_srcdir)/ndb/include/mgmcommon \ -I\$(top_srcdir)/ndb/include/mgmcommon \
-I\$(top_srcdir)/ndb/include/ndbapi \ -I\$(top_srcdir)/ndb/include/ndbapi \
-I\$(top_srcdir)/ndb/include/util \ -I\$(top_srcdir)/ndb/include/util \
...@@ -2888,6 +2889,7 @@ AC_SUBST(mgmapiincludedir) ...@@ -2888,6 +2889,7 @@ AC_SUBST(mgmapiincludedir)
-I\$(top_srcdir)/ndb/include/kernel \ -I\$(top_srcdir)/ndb/include/kernel \
-I\$(top_srcdir)/ndb/include/transporter \ -I\$(top_srcdir)/ndb/include/transporter \
-I\$(top_srcdir)/ndb/include/debugger \ -I\$(top_srcdir)/ndb/include/debugger \
-I\$(top_srcdir)/ndb/include/mgmapi \
-I\$(top_srcdir)/ndb/include/mgmcommon \ -I\$(top_srcdir)/ndb/include/mgmcommon \
-I\$(top_srcdir)/ndb/include/ndbapi \ -I\$(top_srcdir)/ndb/include/ndbapi \
-I\$(top_srcdir)/ndb/include/util \ -I\$(top_srcdir)/ndb/include/util \
......
...@@ -23,7 +23,7 @@ libsignaldataprint_la_SOURCES = \ ...@@ -23,7 +23,7 @@ libsignaldataprint_la_SOURCES = \
FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp \ FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp \
SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp \ SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp \
UtilLock.cpp TuxMaint.cpp TupAccess.cpp AccLock.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/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
......
...@@ -8,6 +8,8 @@ libmgmsrvcommon_la_SOURCES = \ ...@@ -8,6 +8,8 @@ libmgmsrvcommon_la_SOURCES = \
InitConfigFileParser.cpp \ InitConfigFileParser.cpp \
IPCConfig.cpp NdbConfig.c 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/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
......
...@@ -7,7 +7,8 @@ libgeneral_la_SOURCES = \ ...@@ -7,7 +7,8 @@ libgeneral_la_SOURCES = \
OutputStream.cpp NdbOut.cpp BaseString.cpp Base64.cpp \ OutputStream.cpp NdbOut.cpp BaseString.cpp Base64.cpp \
NdbSqlUtil.cpp new.cpp \ NdbSqlUtil.cpp new.cpp \
uucode.c random.c getarg.c version.c \ 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/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am include $(top_srcdir)/ndb/config/type_util.mk.am
......
...@@ -24,7 +24,6 @@ INCLUDES += \ ...@@ -24,7 +24,6 @@ INCLUDES += \
-I../blocks/dbtux -I../blocks/dbtux
LDADD += \ LDADD += \
$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
../blocks/cmvmi/libcmvmi.a \ ../blocks/cmvmi/libcmvmi.a \
../blocks/dbacc/libdbacc.a \ ../blocks/dbacc/libdbacc.a \
../blocks/dbdict/libdbdict.a \ ../blocks/dbdict/libdbdict.a \
...@@ -47,6 +46,7 @@ LDADD += \ ...@@ -47,6 +46,7 @@ LDADD += \
$(top_srcdir)/ndb/src/common/debugger/libtrace.la \ $(top_srcdir)/ndb/src/common/debugger/libtrace.la \
$(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \ $(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
$(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.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/portlib/unix/libportlib.la \
$(top_srcdir)/ndb/src/common/logger/liblogger.la \ $(top_srcdir)/ndb/src/common/logger/liblogger.la \
$(top_srcdir)/ndb/src/common/util/libgeneral.la $(top_srcdir)/ndb/src/common/util/libgeneral.la
......
...@@ -14,13 +14,14 @@ libkernel_a_SOURCES = \ ...@@ -14,13 +14,14 @@ libkernel_a_SOURCES = \
TransporterCallback.cpp \ TransporterCallback.cpp \
Emulator.cpp \ Emulator.cpp \
Configuration.cpp \ Configuration.cpp \
ClusterConfiguration.cpp \
WatchDog.cpp \ WatchDog.cpp \
SimplePropertiesSection.cpp \ SimplePropertiesSection.cpp \
SectionReader.cpp \ SectionReader.cpp \
MetaData.cpp \ MetaData.cpp \
Mutex.cpp SafeCounter.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/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am include $(top_srcdir)/ndb/config/type_kernel.mk.am
......
ndblib_LTLIBRARIES = libmgmapi.la libMGM_API.la 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) libmgmapi_la_SOURCES = $(libmgmapi_la_SOURCES_loc)
libMGM_API_la_SOURCES = $(libmgmapi_la_SOURCES_loc) libMGM_API_la_SOURCES = $(libmgmapi_la_SOURCES_loc)
......
...@@ -14,8 +14,8 @@ LDADD += \ ...@@ -14,8 +14,8 @@ LDADD += \
$(top_srcdir)/ndb/src/common/debugger/libtrace.la \ $(top_srcdir)/ndb/src/common/debugger/libtrace.la \
$(top_srcdir)/ndb/src/common/logger/liblogger.la \ $(top_srcdir)/ndb/src/common/logger/liblogger.la \
$(top_srcdir)/ndb/src/common/util/libgeneral.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/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/portlib/unix/libportlib.la \
$(top_srcdir)/ndb/src/common/editline/libeditline.a $(top_srcdir)/ndb/src/common/editline/libeditline.a
......
...@@ -13,7 +13,7 @@ mgmtsrvr_SOURCES = \ ...@@ -13,7 +13,7 @@ mgmtsrvr_SOURCES = \
MgmtSrvrConfig.cpp \ MgmtSrvrConfig.cpp \
CommandInterpreter.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 = \ LDADD_LOC = \
$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \ $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
......
...@@ -21,10 +21,9 @@ libndbapi_la_SOURCES_loc = \ ...@@ -21,10 +21,9 @@ libndbapi_la_SOURCES_loc = \
NdbOperationInt.cpp \ NdbOperationInt.cpp \
NdbOperationDefine.cpp \ NdbOperationDefine.cpp \
NdbOperationExec.cpp \ NdbOperationExec.cpp \
NdbScanReceiver.cpp \
NdbResultSet.cpp \ NdbResultSet.cpp \
NdbCursorOperation.cpp \ NdbCursorOperation.cpp \
NdbScanOperation.cpp NdbScanFilter.cpp \ NdbScanReceiver.cpp NdbScanOperation.cpp NdbScanFilter.cpp \
NdbIndexOperation.cpp \ NdbIndexOperation.cpp \
NdbEventOperation.cpp \ NdbEventOperation.cpp \
NdbEventOperationImpl.cpp \ NdbEventOperationImpl.cpp \
...@@ -39,6 +38,8 @@ libndbapi_la_SOURCES_loc = \ ...@@ -39,6 +38,8 @@ libndbapi_la_SOURCES_loc = \
libndbapi_la_SOURCES = $(libndbapi_la_SOURCES_loc) libndbapi_la_SOURCES = $(libndbapi_la_SOURCES_loc)
libNDB_API_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/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
...@@ -47,9 +48,10 @@ libNDB_API_la_LIBADD = \ ...@@ -47,9 +48,10 @@ libNDB_API_la_LIBADD = \
$(top_srcdir)/ndb/src/common/debugger/libtrace.la \ $(top_srcdir)/ndb/src/common/debugger/libtrace.la \
$(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \ $(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
$(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.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/portlib/unix/libportlib.la \
$(top_srcdir)/ndb/src/common/logger/liblogger.la \ $(top_srcdir)/ndb/src/common/logger/liblogger.la \
$(top_srcdir)/ndb/src/common/util/libgeneral.la $(top_srcdir)/ndb/src/common/util/libgeneral.la
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
...@@ -10,9 +10,10 @@ libNDBT_a_SOURCES = \ ...@@ -10,9 +10,10 @@ libNDBT_a_SOURCES = \
NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \ NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \
NdbBackup.cpp NdbConfig.cpp NdbGrep.cpp NDBT_Table.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/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapitest.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 # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment