Commit3af7b2b

committed

MERGE fix variable warning in non-assert builds

Author: Jesper Pedersen

1 parenta5d8618 commit3af7b2bCopy full SHA for 3af7b2b

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,11 @@ ExecMerge(ModifyTableState mtstate, EState estate, TupleTableSlot *slot,`
`48`	`48`	`ItemPointertupleid;`
`49`	`49`	`ItemPointerDatatuple_ctid;`
`50`	`50`	`boolmatched= false;`
`51`		`-charrelkind;`
`52`	`51`	`Datumdatum;`
`53`	`52`	`boolisNull;`
`54`	`53`
`55`		`-relkind=resultRelInfo->ri_RelationDesc->rd_rel->relkind;`
`56`		`-Assert(relkind==RELKIND_RELATION\|\|`
`57`		`-relkind==RELKIND_PARTITIONED_TABLE);`
	`54`	`+Assert(resultRelInfo->ri_RelationDesc->rd_rel->relkind\|\|`
	`55`	`+resultRelInfo->ri_RelationDesc->rd_rel->relkind==RELKIND_PARTITIONED_TABLE);`
`58`	`56`
`59`	`57`	`/*`
`60`	`58`	`* Reset per-tuple memory context to free any expression evaluation`

Comments

(0)