Fix rebasing mistake in nodeGather.c

robertmhaas · robertmhaas · commit bf3d0156311f · 2015-11-09T10:49:24.000-05:00
The patches committed as 6e71dd7 and 3a1f861 were developed in parallel but dependent on each other in a way that I failed to notice. This patch to fix the problem was prepared by Amit Kapila.
diff --git a/src/backend/executor/nodeGather.c b/src/backend/executor/nodeGather.c
@@ -341,7 +341,7 @@ gather_readnext(GatherState *gatherstate)
 			--gatherstate->nreaders;
 			if (gatherstate->nreaders == 0)
 			{
-				ExecShutdownGather(gatherstate);
+				ExecShutdownGatherWorkers(gatherstate);
 				return NULL;
 			}
 			else

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ gather_readnext(GatherState *gatherstate)`
`341`	`341`	`--gatherstate->nreaders;`
`342`	`342`	`if (gatherstate->nreaders == 0)`
`343`	`343`	`{`
`344`		`- ExecShutdownGather(gatherstate);`
	`344`	`+ ExecShutdownGatherWorkers(gatherstate);`
`345`	`345`	`return NULL;`
`346`	`346`	`}`
`347`	`347`	`else`