diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index eb78fe484a..fcc16c4342 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.132 2002/09/21 18:39:25 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.133 2002/09/23 22:57:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1209,6 +1209,7 @@ ltrmark:;
 		switch (test)
 		{
 			case HeapTupleSelfUpdated:
+				/* treat it as deleted; do not process */
 				ReleaseBuffer(buffer);
 				return (NULL);
 
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 300c415a01..370d7e52ec 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -27,7 +27,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.178 2002/09/04 20:31:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.179 2002/09/23 22:57:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1032,6 +1032,9 @@ lnext:	;
 					switch (test)
 					{
 						case HeapTupleSelfUpdated:
+							/* treat it as deleted; do not process */
+							goto lnext;
+
 						case HeapTupleMayBeUpdated:
 							break;
 
@@ -1303,6 +1306,7 @@ ldelete:;
 	switch (result)
 	{
 		case HeapTupleSelfUpdated:
+			/* already deleted by self; nothing to do */
 			return;
 
 		case HeapTupleMayBeUpdated:
@@ -1437,6 +1441,7 @@ lreplace:;
 	switch (result)
 	{
 		case HeapTupleSelfUpdated:
+			/* already deleted by self; nothing to do */
 			return;
 
 		case HeapTupleMayBeUpdated: