postgres.git / summary / log / commit / refs

commit    01755490cfa196ddc415308ab5aed8cc45fbaaad
Author:   Alvaro Herrera <alvherre@alvh.no-ip.org>
Date:     Thu Nov 17 11:52:20 2022 +0000
First released in: 16.0, 15.2

    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


 src/backend/executor/nodeModifyTable.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index d8fd3cfdbef..0f357f82217 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:


[parent: af3abca029b3]