From: Simon Riggs <simon@2ndQuadrant.com>
Date: Thu, 5 Apr 2018 12:02:29 +0000 (+0100)
Subject: MERGE fix variable warning in non-assert builds
X-Git-Tag: REL_11_BETA1~356
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3af7b2b0d497cfc240ffc8098ef068adb30048a2;p=thirdparty%2Fpostgresql.git

MERGE fix variable warning in non-assert builds

Author: Jesper Pedersen
---

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