From de19a733afc5b2f1aceec2604a21c9c6ba66a10d Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Thu, 3 Dec 2015 16:18:18 +0200 Subject: [PATCH] Oops, committed some local hacks by accident as part of previous commit. Revert those. --- src/backend/Makefile | 4 ++-- src/backend/gpopt/Makefile | 2 +- src/backend/postmaster/postmaster.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/backend/Makefile b/src/backend/Makefile index d298ae3f2c..ca6211b383 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -68,8 +68,8 @@ LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)) ifeq ($(enable_orca),yes) LIBS := $(LIBS) -L$(LIBGPOS)/$(OBJDIR_DEFAULT) -lgpos LIBS := $(LIBS) -L$(XERCES_LIBDIR) -lxerces-c-3.1 -#LIBS := $(LIBS) -L$(OPTIMIZER)/libnaucrates/$(OBJDIR_DEFAULT) -lnaucrates -#LIBS := $(LIBS) -L$(OPTIMIZER)/libgpdbcost/$(OBJDIR_DEFAULT) -lgpdbcost +LIBS := $(LIBS) -L$(OPTIMIZER)/libnaucrates/$(OBJDIR_DEFAULT) -lnaucrates +LIBS := $(LIBS) -L$(OPTIMIZER)/libgpdbcost/$(OBJDIR_DEFAULT) -lgpdbcost LIBS := $(LIBS) -L$(OPTIMIZER)/libgpopt/$(OBJDIR_DEFAULT) -lgpopt LIBS := $(LIBS) -L$(top_builddir)/src/backend/gpopt -ldxltranslators endif diff --git a/src/backend/gpopt/Makefile b/src/backend/gpopt/Makefile index ebd4fe1548..cad1f9f3bc 100644 --- a/src/backend/gpopt/Makefile +++ b/src/backend/gpopt/Makefile @@ -37,4 +37,4 @@ endif all: - $(CXX) $(ARCH_FLAGS) $(LDFLAGS) $(LDLIBFLAGS) -lgpos -L$(XERCES_LIBDIR) -lxerces-c-3.1 -lgpopt -lpthread -o libdxltranslators.$(LDSFX) $(shell find . -name '*.o' ! -name 'SUBSYS.o') + $(CXX) $(ARCH_FLAGS) $(LDLIBFLAGS) -L$(LIBGPOS)/$(OBJDIR_DEFAULT) -lgpos -L$(XERCES_LIBDIR) -lxerces-c-3.1 -L$(OPTIMIZER)/libnaucrates/$(OBJDIR_DEFAULT) -lnaucrates -L$(OPTIMIZER)/libgpdbcost/$(OBJDIR_DEFAULT) -lgpdbcost -L$(OPTIMIZER)/libgpopt/$(OBJDIR_DEFAULT) -lgpopt -lpthread -o libdxltranslators.$(LDSFX) $(shell find . -name '*.o' ! -name 'SUBSYS.o') diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 09a2e3a35a..bbccf67a4e 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -1308,8 +1308,6 @@ PostmasterMain(int argc, char *argv[]) */ process_shared_preload_libraries(); - gpopt_init(); - /* * Remove old temporary files. At this point there can be no other * Postgres processes running in this directory, so this should be safe. -- GitLab