diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2018-04-05 13:02:29 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2018-04-05 13:02:29 +0100 |
| commit | 3af7b2b0d497cfc240ffc8098ef068adb30048a2 (patch) | |
| tree | 54d33e8642a993c80550687a6887cd0af4d73c44 /src/backend/executor/execMerge.c | |
| parent | a5d86181ecc9c441d4c327771c43134de59549cd (diff) | |
| download | postgresql-3af7b2b0d497cfc240ffc8098ef068adb30048a2.tar.gz postgresql-3af7b2b0d497cfc240ffc8098ef068adb30048a2.zip | |
MERGE fix variable warning in non-assert builds
Author: Jesper Pedersen
Diffstat (limited to 'src/backend/executor/execMerge.c')
| -rw-r--r-- | src/backend/executor/execMerge.c | 6 |
1 files 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 |