Merge branch 'master' into picky_nodes

funbringer · funbringer · commit ace45b9b09ef · 2016-08-24T19:18:38.000+03:00
diff --git a/src/runtime_merge_append.c b/src/runtime_merge_append.c
@@ -133,12 +133,12 @@ unpack_runtimemergeappend_private(RuntimeMergeAppendState *scan_state,
 #define FillStateField(name, type, method) \
 	do \
 	{ \
-		ListCell *lc; \
-		int i = 0; \
+		ListCell   *lc; \
+		int			i = 0; \
 		Assert(scan_state->numCols == list_length(name)); \
-		scan_state->name = palloc(scan_state->numCols * sizeof(type)); \
+		scan_state->name = palloc0(scan_state->numCols * sizeof(type)); \
 		foreach (lc, name) \
-			scan_state->name[i] = lfirst_int(lc); \
+			scan_state->name[i++] = method(lc); \
 	} \
 	while (0)
 
@@ -225,8 +225,8 @@ create_runtimemergeappend_path(PlannerInfo *root,
 
 Plan *
 create_runtimemergeappend_plan(PlannerInfo *root, RelOptInfo *rel,
-						  CustomPath *best_path, List *tlist,
-						  List *clauses, List *custom_plans)
+							   CustomPath *best_path, List *tlist,
+							   List *clauses, List *custom_plans)
 {
 	CustomScan	   *node;
 	Plan		   *plan;
