From: Andres Freund <andres@anarazel.de>
Date: Mon, 18 Feb 2019 19:07:30 +0000 (-0800)
Subject: Remove line duplicated during conflict resolution.
X-Git-Tag: REL_12_BETA1~707
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22bc403029c096639a74d7c91069bf9e8a35460f;p=postgresql

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
---

diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index bc5a524944..8674b3dcf7 100644
--- 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;
 }