sparklet
/
openGauss-server
forked from huawei/openGauss-server
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!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
parent 0b1e6cfd2a 4bbce41a2e
commit f9eddc45b8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/mysql_fdw/Makefile
View File

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

8
third_party/dependency/mysql_fdw/huawei_mysql_fdw-2.5.3_patch.patch vendored
View File

@ -20,7 +20,7 @@ index d5e7b36..157a6cf 100644
ifdef USE_PGXS ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config
@@ -48,8 +50,8 @@ include $(PGXS) @@ -48,13 +50,12 @@ include $(PGXS)
ifndef MAJORVERSION ifndef MAJORVERSION
MAJORVERSION := $(basename $(VERSION)) MAJORVERSION := $(basename $(VERSION))
endif endif
@ -31,6 +31,12 @@ index d5e7b36..157a6cf 100644
endif endif
else 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 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 index 6b18027..0a9e40f 100644
--- a/code/mysql_fdw-REL-2_5_3/connection.cpp --- a/code/mysql_fdw-REL-2_5_3/connection.cpp