summaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/executor/nodeModifyTable.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 8c8b895939c..2cf118c90f0 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -3127,7 +3127,7 @@ lmerge_matched:;
* the tuple moved, and setting our current
* resultRelInfo to that.
*/
- if (ItemPointerIndicatesMovedPartitions(&context->tmfd.ctid))
+ if (ItemPointerIndicatesMovedPartitions(tupleid))
ereport(ERROR,
(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
errmsg("tuple to be deleted was already moved to another partition due to concurrent update")));
@@ -3139,14 +3139,14 @@ lmerge_matched:;
* that the first qualifying WHEN MATCHED action
* is executed.
*
- * Update tupleid to that of the new tuple, for
- * the refetch we do at the top.
+ * tupleid has been updated to that of the new
+ * tuple, as required for the refetch we do at the
+ * top.
*/
if (resultRelInfo->ri_needLockTagTuple)
UnlockTuple(resultRelInfo->ri_RelationDesc,
&lockedtid,
InplaceUpdateTupleLock);
- ItemPointerCopy(&context->tmfd.ctid, tupleid);
goto lmerge_matched;
case TM_Deleted: