diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index ae6a0fc537..d08955163e 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/functions.c,v 1.91.4.1 2005/04/10 18:04:31 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/functions.c,v 1.91.4.2 2006/10/12 17:02:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -328,7 +328,14 @@ postquel_start(execution_state *es, SQLFunctionCachePtr fcache)
 	/* Utility commands don't need Executor. */
 	if (es->qd->operation != CMD_UTILITY)
 	{
-		AfterTriggerBeginQuery();
+		/*
+		 * Only set up to collect queued triggers if it's not a SELECT.
+		 * This isn't just an optimization, but is necessary in case a SELECT
+		 * returns multiple rows to caller --- we mustn't exit from the
+		 * function execution with a stacked AfterTrigger level still active.
+		 */
+		if (es->qd->operation != CMD_SELECT)
+			AfterTriggerBeginQuery();
 		ExecutorStart(es->qd, false);
 	}
 
@@ -401,7 +408,8 @@ postquel_end(execution_state *es)
 			ActiveSnapshot = es->qd->snapshot;
 
 			ExecutorEnd(es->qd);
-			AfterTriggerEndQuery();
+			if (es->qd->operation != CMD_SELECT)
+				AfterTriggerEndQuery();
 		}
 		PG_CATCH();
 		{