From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Thu, 17 Nov 2022 11:52:20 +0000 (+0100)
Subject: Fix outdated comment in ExecDelete
X-Git-Tag: REL_15_2~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cefe182533f38406e032b573dcf506c8da2b0faf;p=thirdparty%2Fpostgresql.git

Fix outdated comment in ExecDelete

This commend references a struct that disappeared before MERGE was
merged ... and ExecDelete is not called by the committed MERGE anyway.
Revert to the original wording.

Backpatch to 15
---

diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 07cd9d3afed..ca95c1d433a 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -1515,13 +1515,7 @@ ldelete:;
 					ereport(ERROR,
 							(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 							 errmsg("could not serialize access due to concurrent delete")));
-
-				/*
-				 * tuple already deleted; nothing to do. But MERGE might want
-				 * to handle it differently. We've already filled-in
-				 * actionInfo with sufficient information for MERGE to look
-				 * at.
-				 */
+				/* tuple already deleted; nothing to do */
 				return NULL;
 
 			default: