postgres.git / summary / log / commit / refs

commit    3af7b2b0d497cfc240ffc8098ef068adb30048a2
Author:   Simon Riggs <simon@2ndQuadrant.com>
Date:     Thu Apr 05 12:02:29 2018 +0000
First released in: master (reverted before release)
Reverted by: 08ea7a2291db (in 11.0)

    MERGE fix variable warning in non-assert builds
    
    Author: Jesper Pedersen


 src/backend/executor/execMerge.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/backend/executor/execMerge.c b/src/backend/executor/execMerge.c
index 471f64361d3..53f4afff0fb 100644
--- a/src/backend/executor/execMerge.c
+++ b/src/backend/executor/execMerge.c
@@ -48,13 +48,11 @@ ExecMerge(ModifyTableState *mtstate, EState *estate, TupleTableSlot *slot,
 	ItemPointer tupleid;
 	ItemPointerData tuple_ctid;
 	bool		matched = false;
-	char		relkind;
 	Datum		datum;
 	bool		isNull;
 
-	relkind = resultRelInfo->ri_RelationDesc->rd_rel->relkind;
-	Assert(relkind == RELKIND_RELATION ||
-		   relkind == RELKIND_PARTITIONED_TABLE);
+	Assert(resultRelInfo->ri_RelationDesc->rd_rel->relkind ||
+		   resultRelInfo->ri_RelationDesc->rd_rel->relkind == RELKIND_PARTITIONED_TABLE);
 
 	/*
 	 * Reset per-tuple memory context to free any expression evaluation


[parent: a5d86181ecc9]