Index: src/backend/commands/vacuum.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/commands/vacuum.c,v
retrieving revision 1.223
diff -c -r1.223 vacuum.c
*** src/backend/commands/vacuum.c	12 Apr 2002 20:38:25 -0000	1.223
--- src/backend/commands/vacuum.c	14 Apr 2002 16:41:37 -0000
***************
*** 181,186 ****
--- 181,189 ----
  	if (IsTransactionBlock())
  		elog(ERROR, "%s cannot run inside a BEGIN/END block", stmttype);
  
+ 	if (!MemoryContextContains(QueryContext, vacstmt))
+ 		elog(ERROR, "VACUUM cannot be executed from a function");
+                         
  	/*
  	 * Send info about dead objects to the statistics collector
  	 */