Fix mishandling of after-trigger state when a SQL function returns multiple

rows --- if the surrounding query queued any trigger events between the rows,
the events would be fired at the wrong time, leading to bizarre behavior.
Per report from Merlin Moncure.

This is a simple patch that should solve the problem fully in the back
branches, but in HEAD we also need to consider the possibility of queries
with RETURNING clauses.  Will look into a fix for that separately.

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,6 +328,13 @@ postquel_start(execution_state *es, SQLFunctionCachePtr fcache)
 	/* Utility commands don't need Executor. */
 	if (es->qd->operation != CMD_UTILITY)
 	{
+		/*
+		 * 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,6 +408,7 @@ postquel_end(execution_state *es)
 			ActiveSnapshot = es->qd->snapshot;
 
 			ExecutorEnd(es->qd);
+			if (es->qd->operation != CMD_SELECT)
 				AfterTriggerEndQuery();
 		}
 		PG_CATCH();