Merge perch.ndb.mysql.com:/home/jonas/src/51-new (5c20cae8) · Commits · Software / OSDI20 Artifacts / mariadb

config/ac-macros/ha_ndbcluster.m4

+0 −10

Original line number	Diff line number	Diff line
		@@ -324,21 +324,11 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
		storage/ndb/src/kernel/Makefile dnl
		storage/ndb/src/kernel/error/Makefile dnl
		storage/ndb/src/kernel/blocks/Makefile dnl
		storage/ndb/src/kernel/blocks/cmvmi/Makefile dnl
		storage/ndb/src/kernel/blocks/dbacc/Makefile dnl
		storage/ndb/src/kernel/blocks/dbdict/Makefile dnl
		storage/ndb/src/kernel/blocks/dbdih/Makefile dnl
		storage/ndb/src/kernel/blocks/dblqh/Makefile dnl
		storage/ndb/src/kernel/blocks/dbtc/Makefile dnl
		storage/ndb/src/kernel/blocks/dbtup/Makefile dnl
		storage/ndb/src/kernel/blocks/ndbfs/Makefile dnl
		storage/ndb/src/kernel/blocks/ndbcntr/Makefile dnl
		storage/ndb/src/kernel/blocks/qmgr/Makefile dnl
		storage/ndb/src/kernel/blocks/trix/Makefile dnl
		storage/ndb/src/kernel/blocks/backup/Makefile dnl
		storage/ndb/src/kernel/blocks/dbutil/Makefile dnl
		storage/ndb/src/kernel/blocks/suma/Makefile dnl
		storage/ndb/src/kernel/blocks/dbtux/Makefile dnl
		storage/ndb/src/kernel/vm/Makefile dnl
		storage/ndb/src/mgmapi/Makefile dnl
		storage/ndb/src/ndbapi/Makefile dnl

storage/ndb/src/kernel/Makefile.am

+0 −15

Original line number	Diff line number	Diff line
		@@ -27,21 +27,6 @@ INCLUDES += \
		-Iblocks

		LDADD += \
		blocks/cmvmi/libcmvmi.a \
		blocks/dbacc/libdbacc.a \
		blocks/dbdict/libdbdict.a \
		blocks/dbdih/libdbdih.a \
		blocks/dblqh/libdblqh.a \
		blocks/dbtc/libdbtc.a \
		blocks/dbtup/libdbtup.a \
		blocks/ndbfs/libndbfs.a \
		blocks/ndbcntr/libndbcntr.a \
		blocks/qmgr/libqmgr.a \
		blocks/trix/libtrix.a \
		blocks/backup/libbackup.a \
		blocks/dbutil/libdbutil.a \
		blocks/suma/libsuma.a \
		blocks/dbtux/libdbtux.a \
		blocks/libblocks.a \
		vm/libkernel.a \
		error/liberror.a \

storage/ndb/src/kernel/blocks/Makefile.am

+30 −12

Original line number	Diff line number	Diff line
		SUBDIRS = \
		cmvmi \
		dbacc \
		dbdict \
		dbdih \
		dblqh \
		dbtc \
		dbtup \
		ndbfs \
		ndbcntr \
		qmgr \
		trix \
		backup \
		dbutil \
		suma \
		dbtux
		backup

		noinst_LIBRARIES = libblocks.a

		INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dblqh
		libblocks_a_SOURCES = tsman.cpp lgman.cpp pgman.cpp diskpage.cpp restore.cpp
		libblocks_a_SOURCES = tsman.cpp lgman.cpp pgman.cpp diskpage.cpp restore.cpp\
		cmvmi/Cmvmi.cpp \
		dbacc/DbaccInit.cpp dbacc/DbaccMain.cpp \
		dbdict/Dbdict.cpp \
		dbdih/DbdihInit.cpp dbdih/DbdihMain.cpp \
		dblqh/DblqhInit.cpp dblqh/DblqhMain.cpp \
		dbtc/DbtcInit.cpp dbtc/DbtcMain.cpp \
		dbtup/DbtupExecQuery.cpp dbtup/DbtupBuffer.cpp \
		dbtup/DbtupRoutines.cpp dbtup/DbtupCommit.cpp \
		dbtup/DbtupFixAlloc.cpp dbtup/DbtupTrigger.cpp \
		dbtup/DbtupAbort.cpp dbtup/DbtupPageMap.cpp \
		dbtup/DbtupPagMan.cpp dbtup/DbtupStoredProcDef.cpp \
		dbtup/DbtupMeta.cpp dbtup/DbtupTabDesMan.cpp \
		dbtup/DbtupGen.cpp dbtup/DbtupIndex.cpp \
		dbtup/DbtupDebug.cpp dbtup/DbtupScan.cpp \
		dbtup/DbtupDiskAlloc.cpp dbtup/DbtupVarAlloc.cpp \
		dbtup/tuppage.cpp dbtup/Undo_buffer.cpp \
		ndbfs/AsyncFile.cpp ndbfs/Ndbfs.cpp ndbfs/VoidFs.cpp \
		ndbfs/Filename.cpp ndbfs/CircularIndex.cpp \
		ndbcntr/NdbcntrInit.cpp ndbcntr/NdbcntrSysTable.cpp ndbcntr/NdbcntrMain.cpp \
		qmgr/QmgrInit.cpp qmgr/QmgrMain.cpp \
		trix/Trix.cpp \
		backup/Backup.cpp backup/BackupInit.cpp \
		dbutil/DbUtil.cpp \
		suma/Suma.cpp suma/SumaInit.cpp \
		dbtux/DbtuxGen.cpp dbtux/DbtuxMeta.cpp dbtux/DbtuxMaint.cpp \
		dbtux/DbtuxNode.cpp dbtux/DbtuxTree.cpp dbtux/DbtuxScan.cpp \
		dbtux/DbtuxSearch.cpp dbtux/DbtuxCmp.cpp dbtux/DbtuxStat.cpp \
		dbtux/DbtuxDebug.cpp

		ndbtools_PROGRAMS = ndb_print_file
		ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp

storage/ndb/src/kernel/blocks/backup/Makefile.am

+0 −17

Original line number	Diff line number	Diff line

		noinst_LIBRARIES = libbackup.a

		libbackup_a_SOURCES = Backup.cpp BackupInit.cpp

		ndbtools_PROGRAMS = ndb_print_backup_file
		ndb_print_backup_file_SOURCES = read.cpp
		ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
		@@ -17,16 +13,3 @@ include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
		# Don't update the files from bitkeeper
		%::SCCS/s.%

		windoze-dsp: libbackup.dsp

		libbackup.dsp: Makefile \
		$(top_srcdir)/storage/ndb/config/win-lib.am \
		$(top_srcdir)/storage/ndb/config/win-name \
		$(top_srcdir)/storage/ndb/config/win-includes \
		$(top_srcdir)/storage/ndb/config/win-sources \
		$(top_srcdir)/storage/ndb/config/win-libraries
		cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
		@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
		@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
		@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libbackup_a_SOURCES)
		@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

storage/ndb/src/kernel/blocks/cmvmi/Makefile.am

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line

		noinst_LIBRARIES = libcmvmi.a

		libcmvmi_a_SOURCES = Cmvmi.cpp

		include $(top_srcdir)/storage/ndb/config/common.mk.am
		include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am

		# Don't update the files from bitkeeper
		%::SCCS/s.%

		windoze-dsp: libcmvmi.dsp

		libcmvmi.dsp: Makefile \
		$(top_srcdir)/storage/ndb/config/win-lib.am \
		$(top_srcdir)/storage/ndb/config/win-name \
		$(top_srcdir)/storage/ndb/config/win-includes \
		$(top_srcdir)/storage/ndb/config/win-sources \
		$(top_srcdir)/storage/ndb/config/win-libraries
		cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
		@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
		@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
		@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libcmvmi_a_SOURCES)
		@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)