external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge errors

pull/5661/head
Yanwen Jin 2022-02-07 13:54:08 -08:00
parent 1483b9d5c0
commit aa72313c85
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/columnar/columnar_debug.c
View File

@ -11,7 +11,6 @@
#include "postgres.h" #include "postgres.h"
#include "funcapi.h" #include "funcapi.h"
#include "pg_config.h"
#include "access/nbtree.h" #include "access/nbtree.h"
#include "access/table.h" #include "access/table.h"
#include "catalog/pg_am.h" #include "catalog/pg_am.h"

4
src/backend/columnar/mod.c
View File

@ -29,4 +29,8 @@ void _PG_init(void);
void void
_PG_init(void) _PG_init(void)
{
columnar_init_gucs();
columnar_tableam_init();
}

2
src/backend/distributed/Makefile
View File

@ -38,7 +38,7 @@ NO_PGXS = 1
SHLIB_LINK += $(libpq) SHLIB_LINK += $(libpq)
SHLIB_LINK_INTERNAL += -L../columnar -l:columnar.so SHLIB_LINK_INTERNAL += -L../columnar -l:columnar.so
override enable_rpath = yes
include $(citus_top_builddir)/Makefile.global include $(citus_top_builddir)/Makefile.global
rpathdir = $(shell $(PG_CONFIG) --libdir):$(shell $(PG_CONFIG) --pkglibdir) rpathdir = $(shell $(PG_CONFIG) --libdir):$(shell $(PG_CONFIG) --pkglibdir)