Commit 22bc4030 authored by Andres Freund's avatar Andres Freund

Remove line duplicated during conflict resolution.

I included the duplicated ExecTypeFromTL in 578b2297 "Remove WITH OIDS
support".

Reported-By: Peter Eisentraut
Discussion: https://postgr.es/m/ba819888-63c6-7f98-6acb-3731142d9414@2ndquadrant.com
parent 93b5cc03
...@@ -1604,7 +1604,6 @@ ExecInitResultTypeTL(PlanState *planstate) ...@@ -1604,7 +1604,6 @@ ExecInitResultTypeTL(PlanState *planstate)
{ {
TupleDesc tupDesc = ExecTypeFromTL(planstate->plan->targetlist); TupleDesc tupDesc = ExecTypeFromTL(planstate->plan->targetlist);
tupDesc = ExecTypeFromTL(planstate->plan->targetlist);
planstate->ps_ResultTupleDesc = tupDesc; planstate->ps_ResultTupleDesc = tupDesc;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment