Remove line duplicated during conflict resolution.

anarazel · anarazel · commit 22bc403029c0 · 2019-02-18T11:07:30.000-08:00
I included the duplicated ExecTypeFromTL in 578b229 "Remove WITH OIDS support". Reported-By: Peter Eisentraut Discussion: https://postgr.es/m/ba819888-63c6-7f98-6acb-3731142d9414@2ndquadrant.com
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
@@ -1604,7 +1604,6 @@ ExecInitResultTypeTL(PlanState *planstate)
 {
 	TupleDesc	tupDesc = ExecTypeFromTL(planstate->plan->targetlist);
 
-	tupDesc = ExecTypeFromTL(planstate->plan->targetlist);
 	planstate->ps_ResultTupleDesc = tupDesc;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1604,7 +1604,6 @@ ExecInitResultTypeTL(PlanState *planstate)`
`1604`	`1604`	`{`
`1605`	`1605`	`TupleDesc tupDesc = ExecTypeFromTL(planstate->plan->targetlist);`
`1606`	`1606`
`1607`		`- tupDesc = ExecTypeFromTL(planstate->plan->targetlist);`
`1608`	`1607`	`planstate->ps_ResultTupleDesc = tupDesc;`
`1609`	`1608`	`}`
`1610`	`1609`