revision-id: cf25bb5ccb48e30756b2d1236636f2154ce5ec3b (v5.8-1033-gcf25bb5cc) parent(s): 2a5518408b99d6de1d040acbba2aba5bfac5e7f9 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-03-04 23:58:40 +0300 message: Range Locking: fix non-cmake compilation (FB/MySQL-5.6 uses portions of it) --- Makefile | 5 ++++- src.mk | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0fc43d0ff..074194b32 100644 --- a/Makefile +++ b/Makefile @@ -331,7 +331,10 @@ ifeq ($(NO_THREEWAY_CRC32C), 1) endif CFLAGS += $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CCFLAGS) $(OPT) -CXXFLAGS += $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers +CXXFLAGS += $(WARNING_FLAGS) -I. -I./include \ + -I./utilities/transactions/range_locking \ + -I./utilities/transactions/range_locking/portability \ + $(PLATFORM_CXXFLAGS) $(OPT) -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers LDFLAGS += $(PLATFORM_LDFLAGS) diff --git a/src.mk b/src.mk index 9a0ce92ba..f3372258f 100644 --- a/src.mk +++ b/src.mk @@ -217,6 +217,24 @@ LIB_SOURCES = \ utilities/ttl/db_ttl_impl.cc \ utilities/write_batch_with_index/write_batch_with_index.cc \ utilities/write_batch_with_index/write_batch_with_index_internal.cc \ + utilities/transactions/range_locking/locktree/keyrange.cc \ + utilities/transactions/range_locking/locktree/keyrange.h \ + utilities/transactions/range_locking/locktree/txnid_set.h \ + utilities/transactions/range_locking/locktree/range_buffer.cc \ + utilities/transactions/range_locking/locktree/locktree.h \ + utilities/transactions/range_locking/locktree/treenode.h \ + utilities/transactions/range_locking/locktree/wfg.cc \ + utilities/transactions/range_locking/locktree/lock_request.cc \ + utilities/transactions/range_locking/locktree/locktree.cc \ + utilities/transactions/range_locking/locktree/range_buffer.h \ + utilities/transactions/range_locking/locktree/manager.cc \ + utilities/transactions/range_locking/locktree/wfg.h \ + utilities/transactions/range_locking/locktree/txnid_set.cc \ + utilities/transactions/range_locking/locktree/lock_request.h \ + utilities/transactions/range_locking/locktree/concurrent_tree.h \ + utilities/transactions/range_locking/util/dbt.cc \ + utilities/transactions/range_locking/util/memarena.cc \ + utilities/transactions/range_locking/standalone_port.cc \ ifeq (,$(shell $(CXX) -fsyntax-only -maltivec -xc /dev/null 2>&1)) LIB_SOURCES_ASM =\