Skip to content

Commit

Permalink
Fix handling of oldtuple to match PG17 upstream (#7340)
Browse files Browse the repository at this point in the history
A [previous
commit](d7513b2)
I made added support for MERGE ... RETURNING ....
While working on the coverity fix, I realized that this code handling
oldtuple was not added; that's what this fixes.

Disable-check: force-changelog-file
  • Loading branch information
kpan2034 authored Oct 24, 2024
1 parent 04f0b47 commit 650d331
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/import/ht_hypertable_modify.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,12 @@ lmerge_matched:;
* visible to our MVCC snapshot.
*/

#if PG17_GE
if (oldtuple != NULL)
ExecForceStoreHeapTuple(oldtuple, resultRelInfo->ri_oldTupleSlot,
false);
else
#endif
if (!table_tuple_fetch_row_version(resultRelInfo->ri_RelationDesc,
tupleid,
SnapshotAny,
Expand Down

0 comments on commit 650d331

Please sign in to comment.