Hi,
On 04/05/2018 07:48 AM, Simon Riggs wrote:
Updated version due to latest refactoring.
Thanks for your input. Removing that seems to prevent compilation.
Did something change in between?
Updated for non-assert build.
Best regards,
Jesper
diff --git a/src/backend/executor/execMerge.c b/src/backend/executor/execMerge.c
index 471f64361d..53f4afff0f 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
