!22 Fix compile error in mysql_fdw.

Merge pull request !22 from TotaJ/bug/mysql_fdw
This commit is contained in:
opengauss-bot
2020-07-14 14:10:25 +08:00
committed by Gitee
2 changed files with 10 additions and 5 deletions

View File

@ -33,12 +33,11 @@ MYSQL_FDW_MEGRED_SOURCES_DIR=$(MYSQL_FDW_DIR)/code
.PHONY: mysql_fdw_target
mysql_fdw_target:
@$(call create_mysql_fdw_sources)
@make -C $(MYSQL_FDW_MEGRED_SOURCES_DIR)/$(MYSQL_FDW_PACKAGE) USE_PGXS=1
@make -C $(MYSQL_FDW_MEGRED_SOURCES_DIR)/$(MYSQL_FDW_PACKAGE)
.PHONY: install-data
install-data:
@$(call create_mysql_fdw_sources)
@make -C $(MYSQL_FDW_MEGRED_SOURCES_DIR)/$(MYSQL_FDW_PACKAGE) USE_PGXS=1 install
install-data: mysql_fdw_target
@make -C $(MYSQL_FDW_MEGRED_SOURCES_DIR)/$(MYSQL_FDW_PACKAGE) install
uninstall distclean clean:
@rm -rf $(MYSQL_FDW_MEGRED_SOURCES_DIR)

View File

@ -20,7 +20,7 @@ index d5e7b36..157a6cf 100644
ifdef USE_PGXS
PG_CONFIG = pg_config
@@ -48,8 +50,8 @@ include $(PGXS)
@@ -48,13 +50,12 @@ include $(PGXS)
ifndef MAJORVERSION
MAJORVERSION := $(basename $(VERSION))
endif
@ -31,6 +31,12 @@ index d5e7b36..157a6cf 100644
endif
else
-subdir = contrib/mysql_fdw
-top_builddir = ../..
+top_builddir = ../../../../../
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif
diff --git a/code/mysql_fdw-REL-2_5_3/connection.cpp b/code/mysql_fdw-REL-2_5_3/connection.cpp
index 6b18027..0a9e40f 100644
--- a/code/mysql_fdw-REL-2_5_3/connection.cpp