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 471f64361d3f8ed370d09d79064206c8875e9e18..53f4afff0fbbdf122bd813299ab2621d5f093c28 100644 (file)
--- 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