Skip to content

Commit 9295350

Browse files
funbringerfunbringer
committed
resolve conflicts caused by merge of branch 'rel_1_2_beta'
2 parents 01ef629 + 7d81364 commit 9295350

24 files changed

+2070
-891
lines changed

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
55
src/runtimeappend.o src/runtime_merge_append.o src/pg_pathman.o src/rangeset.o \
66
src/pl_funcs.o src/pl_range_funcs.o src/pl_hash_funcs.o src/pathman_workers.o \
77
src/hooks.o src/nodes_common.o src/xact_handling.o src/utility_stmt_hooking.o \
8-
src/planner_tree_modification.o src/debug_print.o src/pg_compat.o $(WIN32RES)
8+
src/planner_tree_modification.o src/debug_print.o src/pg_compat.o \
9+
src/partition_creation.o $(WIN32RES)
910

1011
EXTENSION = pg_pathman
1112
EXTVERSION = 1.1

0 commit comments

Comments
 (0)