Clean up #include in /include directory. Add scripts for checking includes.

27 years ago · 4b2c2850bf
parent 0df761420d
commit 4b2c2850bf
286 changed files with 421 additions and 737 deletions
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@ -39,7 +39,7 @@ Portability fixes for linux_ppc, Irix, linux_alpha, OpenBSD, alpha
 Remove QUERY_LIMIT, use SELECT...LIMIT
 Fix for EXPLAIN on inheritance(Tom)
 Patch to allow vacuum on multi-segment tables(Hiroshi)
-R=Tree optimizer selectivity fix(Tom)
+R-Tree optimizer selectivity fix(Tom)
 ACL file descriptor leak fix(Atsushi Ogawa)
 New expresssion subtree code(Tom)
 Avoid disk writes for read-only transactions(Vadim)
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@ -14,6 +14,7 @@
 #include <postgres.h>

 #include <fmgr.h>
+#include <catalog/pg_index.h>
 #include <access/genam.h>
 #include <access/gist.h>
 #include <access/gistscan.h>
--- a/src/backend/access/hash/hashscan.c
+++ b/src/backend/access/hash/hashscan.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.18 1999/07/14 01:19:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.19 1999/07/15 15:18:33 momjian Exp $
 *
 * NOTES
 *	  Because we can be doing an index scan on a relation while we
@ -30,7 +30,6 @@
 #include <postgres.h>

 #include <access/hash.h>
-#include <utils/mcxt.h>

 static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
 static bool _hash_scantouched(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.16 1999/07/14 01:19:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.17 1999/07/15 15:18:33 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -18,7 +18,6 @@
 #include <fmgr.h>
 #include <utils/memutils.h>
 #include <access/iqual.h>
-#include <utils/mcxt.h>

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.47 1999/07/14 01:19:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.48 1999/07/15 15:18:35 momjian Exp $
 *
 *
 * INTERFACE ROUTINES
@ -89,7 +89,6 @@
 #include <utils/inval.h>
 #include <utils/memutils.h>
 #include <utils/builtins.h>
-#include <utils/mcxt.h>

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.16 1999/07/03 00:32:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.17 1999/07/15 15:18:35 momjian Exp $
 *
 * NOTES
 *	  initam should be moved someplace else.
@ -21,7 +21,6 @@
 #include <postgres.h>

 #include <access/heapam.h>
-#include <utils/mcxt.h>

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.31 1999/07/14 01:19:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.32 1999/07/15 15:18:37 momjian Exp $
 *
 * INTERFACE ROUTINES
 *		index_open		- open an index relation by relationId
@ -70,7 +70,6 @@
 #include <fmgr.h>
 #include <storage/lmgr.h>
 #include <access/heapam.h>
-#include <utils/mcxt.h>

 /* ----------------
 *	 undefine macros we aren't going to use that would otherwise
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.43 1999/07/14 01:19:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.44 1999/07/15 15:18:38 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -19,8 +19,9 @@
 #include <access/nbtree.h>
 #include <access/heapam.h>
 #include <access/xact.h>
+#include <storage/bufmgr.h>
+#include <access/transam.h>
 #include <fmgr.h>
-#include <utils/mcxt.h>

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.25 1999/07/14 01:19:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.26 1999/07/15 15:18:39 momjian Exp $
 *
 *	NOTES
 *	   Postgres btree pages look like ordinary relation pages.	The opaque
@ -28,7 +28,7 @@
 #include <access/nbtree.h>
 #include <miscadmin.h>
 #include <storage/lmgr.h>
-#include <utils/mcxt.h>
+#include <storage/bufmgr.h>

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.24 1999/07/14 01:19:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.25 1999/07/15 15:18:40 momjian Exp $
 *
 *
 * NOTES
@ -30,8 +30,8 @@
 #include <postgres.h>

 #include <storage/bufpage.h>
+#include <storage/bufmgr.h>
 #include <access/nbtree.h>
-#include <utils/mcxt.h>

 typedef struct BTScanListData
 {
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.46 1999/07/14 01:19:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.47 1999/07/15 15:18:40 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -17,9 +17,9 @@
 #include <access/genam.h>
 #include <fmgr.h>
 #include <storage/bufpage.h>
+#include <storage/bufmgr.h>
 #include <access/nbtree.h>
 #include <catalog/pg_proc.h>
-#include <utils/mcxt.h>

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@ -5,7 +5,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Id: nbtsort.c,v 1.41 1999/07/14 01:19:42 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.42 1999/07/15 15:18:41 momjian Exp $
 *
 * NOTES
 *
@ -53,8 +53,8 @@

 #include "access/nbtree.h"
 #include "storage/bufpage.h"
+#include "storage/bufmgr.h"
 #include "utils/memutils.h"
-#include "utils/mcxt.h"

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.28 1999/07/14 01:19:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.29 1999/07/15 15:18:41 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -21,7 +21,6 @@
 #include "executor/execdebug.h"
 #include "fmgr.h"
 #include "storage/bufpage.h"
-#include "utils/mcxt.h"

 extern int	NIndexTupleProcessed;

--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.14 1999/07/14 01:19:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.15 1999/07/15 15:18:43 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -20,7 +20,6 @@
 #include <access/iqual.h>
 #include <access/rtree.h>
 #include <storage/bufpage.h>
-#include <utils/mcxt.h>

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.19 1999/07/14 01:19:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.20 1999/07/15 15:18:44 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -16,7 +16,6 @@

 #include <utils/builtins.h>
 #include <utils/geo_decls.h>
-#include <utils/mcxt.h>

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.24 1999/07/14 01:19:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.25 1999/07/15 15:18:44 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -20,7 +20,6 @@
 #include <storage/bufpage.h>
 #include <access/rtree.h>
 #include <access/rtstrat.h>
-#include <utils/mcxt.h>

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.27 1999/06/10 14:17:06 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.28 1999/07/15 15:18:44 momjian Exp $
 *
 * NOTES
 *	  This file contains the high level access-method interface to the
@ -21,7 +21,6 @@
 #include <access/transam.h>
 #include <access/xact.h>
 #include <access/heapam.h>
-#include <utils/mcxt.h>
 #include <catalog/catname.h>
 #include <storage/spin.h>
 #include <commands/vacuum.h>
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.42 1999/06/29 04:54:46 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.43 1999/07/15 15:18:45 momjian Exp $
 *
 * NOTES
 *		Transaction aborts can now occur two ways:
@ -150,7 +150,6 @@
 #include <access/transam.h>
 #include <storage/fd.h>
 #include <storage/proc.h>
-#include <utils/mcxt.h>
 #include <catalog/heap.h>
 #include <utils/relcache.h>
 #include <miscadmin.h>
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- *	$Id: xid.c,v 1.23 1999/07/14 01:19:45 momjian Exp $
+ *	$Id: xid.c,v 1.24 1999/07/15 15:18:45 momjian Exp $
 *
 * OLD COMMENTS
 * XXX WARNING
@ -22,7 +22,6 @@

 #include <postgres.h>
 #include <access/xact.h>
-#include <utils/mcxt.h>

 extern TransactionId NullTransactionId;
 extern TransactionId DisabledTransactionId;
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@ -7,7 +7,7 @@
 * Copyright (c) 1994, Regents of the University of California
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.60 1999/05/25 16:07:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.61 1999/07/15 15:18:46 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -75,7 +75,6 @@
 #include "utils/geo_decls.h"
 #include "utils/hsearch.h"
 #include "utils/lsyscache.h"
-#include "utils/mcxt.h"
 #include "utils/nabstime.h"
 #include "utils/portal.h"
 #include "utils/rel.h"
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.89 1999/07/08 02:46:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.90 1999/07/15 15:18:48 momjian Exp $
 *
 *
 * INTERFACE ROUTINES
@ -57,7 +57,6 @@
 #include "tcop/tcopprot.h"
 #include "utils/catcache.h"
 #include "utils/builtins.h"
-#include "utils/mcxt.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.81 1999/07/07 09:27:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.82 1999/07/15 15:18:49 momjian Exp $
 *
 *
 * INTERFACE ROUTINES
@ -30,6 +30,7 @@
 #include "catalog/heap.h"
 #include "catalog/index.h"
 #include "catalog/indexing.h"
+#include "catalog/pg_index.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "executor/executor.h"
@ -40,9 +41,9 @@
 #include "parser/parse_func.h"
 #include "storage/lmgr.h"
 #include "storage/smgr.h"
+#include "storage/bufpage.h"
 #include "utils/builtins.h"
 #include "utils/catcache.h"
-#include "utils/mcxt.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.37 1999/05/25 16:08:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.38 1999/07/15 15:18:50 momjian Exp $
 *
 * NOTES
 *	  these routines moved here from commands/define.c and somewhat cleaned up.
@ -19,8 +19,10 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_operator.h"
+#include "parser/parse_type.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "parser/parse_func.h"
 #include "fmgr.h"
 #include "miscadmin.h"
 #include "parser/parse_oper.h"
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.29 1999/05/25 16:08:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.30 1999/07/15 15:18:50 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -30,6 +30,7 @@
 #include "utils/lsyscache.h"
 #include "utils/sets.h"
 #include "utils/syscache.h"
+#include "parser/parse_type.h"

 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@ -14,7 +14,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.39 1999/05/25 16:08:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.40 1999/07/15 15:18:52 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -41,7 +41,6 @@
 #include <commands/command.h>
 #include <utils/builtins.h>
 #include <utils/excid.h>
-#include <utils/mcxt.h>
 #include <catalog/pg_proc.h>
 #include <catalog/pg_class.h>
 #include <optimizer/internal.h>
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.47 1999/06/19 04:54:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.48 1999/07/15 15:18:52 momjian Exp $
 *
 * NOTES
 *	  The PortalExecutorHeapMemory crap needs to be eliminated
@ -36,7 +36,6 @@
 #include "utils/acl.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
-#include "utils/mcxt.h"
 #include "utils/portal.h"
 #include "utils/relcache.h"
 #include "utils/temprel.h"
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@ -9,7 +9,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.29 1999/05/25 16:08:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.30 1999/07/15 15:18:53 momjian Exp $
 *
 * DESCRIPTION
 *	  The "DefineFoo" routines take the parse tree and pick out the
@ -50,9 +50,9 @@
 #include <fmgr.h>				/* for fmgr */
 #include <utils/builtins.h>		/* prototype for textin() */
 #include <commands/defrem.h>
-#include <optimizer/xfunc.h>
 #include <tcop/dest.h>
 #include <catalog/pg_shadow.h>
+#include <optimizer/cost.h>

 static char *defGetString(DefElem *def);
 static int	defGetTypeLength(DefElem *def);
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.25 1999/05/25 16:08:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.26 1999/07/15 15:18:54 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -30,7 +30,6 @@
 #include <commands/command.h>
 #include <storage/bufmgr.h>
 #include <utils/excid.h>
-#include <utils/mcxt.h>
 #include <catalog/pg_proc.h>
 #include <catalog/pg_class.h>
 #include <optimizer/internal.h>
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@ -23,8 +23,8 @@
 #include "nodes/memnodes.h"
 #include "nodes/parsenodes.h"
 #include "storage/lmgr.h"
+#include "storage/bufpage.h"
 #include "storage/bufmgr.h"
-#include "utils/mcxt.h"
 #include "utils/inval.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.110 1999/07/03 00:32:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.111 1999/07/15 15:18:55 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -44,7 +44,6 @@
 #include "storage/lmgr.h"
 #include "utils/builtins.h"
 #include "utils/inval.h"
-#include "utils/mcxt.h"
 #include "utils/portal.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
--- a/src/backend/executor/_deadcode/nodeTee.c
+++ b/src/backend/executor/_deadcode/nodeTee.c
@ -14,7 +14,7 @@
 *		ExecInitTee
 *		ExecEndTee
 *
- *	$Id: nodeTee.c,v 1.3 1999/05/25 22:41:04 momjian Exp $
+ *	$Id: nodeTee.c,v 1.4 1999/07/15 15:19:02 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -23,9 +23,7 @@
 #include <sys/file.h>
 #include "postgres.h"

-#include "utils/palloc.h"
 #include "utils/relcache.h"
-#include "utils/mcxt.h"
 #include "storage/bufmgr.h"
 #include "storage/smgr.h"
 #include "optimizer/internal.h"
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- *	$Id: execAmi.c,v 1.36 1999/07/13 21:17:31 momjian Exp $
+ *	$Id: execAmi.c,v 1.37 1999/07/15 15:18:56 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -30,7 +30,6 @@

 #include "executor/executor.h"
 #include "storage/smgr.h"
-#include "utils/mcxt.h"
 #include "executor/nodeSeqscan.h"
 #include "executor/nodeIndexscan.h"
 #include "executor/nodeSort.h"
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.17 1999/05/17 17:03:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.18 1999/07/15 15:18:57 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -16,7 +16,6 @@

 #include "postgres.h"

-#include "utils/palloc.h"
 #include "access/heapam.h"
 #include "executor/executor.h"
 #include "nodes/relation.h"
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@ -26,7 +26,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.88 1999/06/17 15:15:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.89 1999/07/15 15:18:57 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -39,7 +39,6 @@
 #include "executor/execdebug.h"
 #include "executor/nodeIndexscan.h"
 #include "utils/builtins.h"
-#include "utils/palloc.h"
 #include "utils/acl.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
@ -54,6 +53,7 @@
 #include "access/xact.h"
 #include "catalog/heap.h"
 #include "commands/trigger.h"
+#include "access/transam.h"

 void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
 			   Query *parseTree);
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.53 1999/06/12 19:22:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.54 1999/07/15 15:18:57 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -49,7 +49,6 @@
 #include "utils/builtins.h"
 #include "utils/fcache.h"
 #include "utils/fcache2.h"
-#include "utils/mcxt.h"
 #include "utils/memutils.h"


--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@ -14,7 +14,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.25 1999/05/25 16:08:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.26 1999/07/15 15:18:58 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -128,7 +128,6 @@
 #include "catalog/pg_type.h"
 #include "parser/parse_type.h"
 #include "storage/bufmgr.h"
-#include "utils/palloc.h"
 #include "utils/lsyscache.h"

 static TupleTableSlot *NodeGetResultTupleSlot(Plan *node);
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.45 1999/05/25 16:08:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.46 1999/07/15 15:18:58 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -55,7 +55,7 @@
 #include "optimizer/clauses.h"
 #include "parser/parsetree.h"
 #include "utils/lsyscache.h"
-#include "utils/mcxt.h"
+#include "catalog/pg_index.h"

 static void ExecGetIndexKeyInfo(Form_pg_index indexTuple, int *numAttsOutP,
 					AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP);
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.26 1999/05/25 16:08:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.27 1999/07/15 15:18:59 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -28,8 +28,6 @@
 #include "fmgr.h"
 #include "utils/fcache.h"
 #include "utils/datum.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/syscache.h"
 #include "catalog/pg_language.h"
 #include "access/heapam.h"
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@ -27,7 +27,6 @@
 #include "executor/executor.h"
 #include "executor/nodeAgg.h"
 #include "storage/bufmgr.h"
-#include "utils/palloc.h"
 #include "utils/syscache.h"
 #include "optimizer/clauses.h"

--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.19 1999/05/25 16:08:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.20 1999/07/15 15:19:01 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -61,8 +61,6 @@
 #include "executor/execdebug.h"
 #include "executor/nodeAppend.h"
 #include "executor/nodeIndexscan.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 #include "parser/parsetree.h"	/* for rt_store() macro */

 static bool exec_append_initialize_next(Append *node);
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.36 1999/05/25 16:08:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.37 1999/07/15 15:19:01 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -40,8 +40,6 @@
 #include "access/skey.h"
 #include "access/heapam.h"
 #include "access/genam.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 #include "catalog/index.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.19 1999/06/03 03:17:37 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.20 1999/07/15 15:19:01 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -18,7 +18,6 @@
 #include "executor/execdebug.h"
 #include "executor/nodeSort.h"
 #include "access/heapam.h"
-#include "utils/palloc.h"
 #include "utils/psort.h"
 #include "catalog/catalog.h"
 #include "catalog/heap.h"
--- a/src/backend/lib/stringinfo.c
+++ b/src/backend/lib/stringinfo.c
@ -8,7 +8,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- *	  $Id: stringinfo.c,v 1.18 1999/07/14 01:19:46 momjian Exp $
+ *	  $Id: stringinfo.c,v 1.19 1999/07/15 15:19:02 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -18,7 +18,6 @@

 #include "postgres.h"
 #include "lib/stringinfo.h"
-#include "utils/mcxt.h"

 #ifdef NOT_USED
 /*
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- *	$Id: be-dumpdata.c,v 1.25 1999/05/25 22:41:06 momjian Exp $
+ *	$Id: be-dumpdata.c,v 1.26 1999/07/15 15:19:03 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -38,7 +38,6 @@
 #include <storage/buf.h>
 #include <utils/memutils.h>
 #include <fmgr.h>
-#include <utils/mcxt.h>
 #include <utils/exc.h>
 #include <utils/syscache.h>
 #include <catalog/pg_type.h>
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.35 1999/06/04 21:13:38 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.36 1999/07/15 15:19:04 momjian Exp $
 *
 * NOTES
 *	  This should be moved to a more appropriate place.  It is here
@ -43,7 +43,6 @@
 #include <nodes/nodes.h>
 #include <utils/memutils.h>
 #include <lib/fstack.h>
-#include <utils/mcxt.h>
 #include <catalog/pg_shadow.h>	/* for superuser() */
 #include <storage/fd.h>			/* for O_ */
 #include <storage/large_object.h>
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@ -9,7 +9,7 @@
 * Dec 17, 1997 - Todd A. Brandys
 *	Orignal Version Completed.
 *
- * $Id: crypt.c,v 1.19 1999/07/14 01:19:47 momjian Exp $
+ * $Id: crypt.c,v 1.20 1999/07/15 15:19:05 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -24,7 +24,6 @@
 #include "utils/nabstime.h"
 #include "storage/fd.h"
 #include "libpq/crypt.h"
-#include "utils/mcxt.h"

 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.82 1999/05/25 22:41:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.83 1999/07/15 15:19:06 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -25,8 +25,6 @@

 #include "utils/syscache.h"
 #include "utils/builtins.h"		/* for namecpy */
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "catalog/pg_type.h"
 #include "storage/lmgr.h"
 #include "optimizer/planmain.h"
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.39 1999/06/06 17:46:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.40 1999/07/15 15:19:06 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -23,7 +23,6 @@

 #include "utils/builtins.h"		/* for namestrcmp() */
 #include "utils/datum.h"
-#include "utils/elog.h"
 #include "storage/itemptr.h"

 static bool equali(List *a, List *b);
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.19 1999/05/26 12:55:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.20 1999/07/15 15:19:07 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -25,8 +25,6 @@

 #include "utils/syscache.h"
 #include "utils/builtins.h"		/* for namecpy */
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "catalog/pg_type.h"
 #include "storage/lmgr.h"
 #include "optimizer/planmain.h"
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.22 1999/07/14 01:19:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.23 1999/07/15 15:19:07 momjian Exp $
 *
 * NOTES
 *	  XXX a few of the following functions are duplicated to handle
@ -26,9 +26,6 @@
 #include "nodes/pg_list.h"
 #include "nodes/parsenodes.h"
 #include "utils/builtins.h"		/* for namecpy */
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"

 /*
 *	makeList
--- a/src/backend/nodes/nodes.c
+++ b/src/backend/nodes/nodes.c
@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.8 1999/07/14 01:19:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.9 1999/07/15 15:19:08 momjian Exp $
 *
 * HISTORY
 *	  Andrew Yu			Oct 20, 1994	file creation
@ -17,10 +17,7 @@
 */
 #include <string.h>
 #include "postgres.h"
-#include "utils/palloc.h"
-#include "utils/elog.h"
 #include "nodes/nodes.h"
-#include "utils/mcxt.h"

 /*
 * newNode -
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- *	$Id: outfuncs.c,v 1.86 1999/05/25 22:41:14 momjian Exp $
+ *	$Id: outfuncs.c,v 1.87 1999/07/15 15:19:08 momjian Exp $
 *
 * NOTES
 *	  Every (plan) node in POSTGRES has an associated "out" routine which
@ -27,9 +27,7 @@
 #include "utils/syscache.h"
 #include "utils/lsyscache.h"
 #include "fmgr.h"
-#include "utils/elog.h"
 #include "utils/datum.h"
-#include "utils/palloc.h"

 #include "nodes/nodes.h"
 #include "nodes/execnodes.h"
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.15 1999/05/19 16:46:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.16 1999/07/15 15:19:08 momjian Exp $
 *
 * HISTORY
 *	  AUTHOR			DATE			MAJOR EVENT
@ -22,7 +22,6 @@
 #include "postgres.h"
 #include "nodes/pg_list.h"
 #include "nodes/readfuncs.h"
-#include "utils/elog.h"

 /*
 * stringToNode -
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.65 1999/07/13 21:17:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.66 1999/07/15 15:19:08 momjian Exp $
 *
 * NOTES
 *	  Most of the read functions for plan nodes are tested. (In fact, they
@ -32,8 +32,6 @@
 #include "access/htup.h"
 #include "fmgr.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"

 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@ -4,7 +4,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: geqo_copy.c,v 1.5 1999/02/13 23:16:04 momjian Exp $
+ * $Id: geqo_copy.c,v 1.6 1999/07/15 15:19:09 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -37,10 +37,6 @@
 #include "nodes/pg_list.h"
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
-
-#include "utils/palloc.h"
-#include "utils/elog.h"
-
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@ -6,7 +6,7 @@
 *	 CX operator according to Oliver et al
 *	 (Proc 2nd Int'l Conf on GA's)
 *
-* $Id: geqo_cx.c,v 1.6 1999/02/13 23:16:05 momjian Exp $
+* $Id: geqo_cx.c,v 1.7 1999/07/15 15:19:10 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -40,8 +40,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@ -3,7 +3,7 @@
 * geqo_erx.c
 *	 edge recombination crossover [ER]
 *
-* $Id: geqo_erx.c,v 1.12 1999/07/14 01:19:51 momjian Exp $
+* $Id: geqo_erx.c,v 1.13 1999/07/15 15:19:11 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -37,8 +37,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@ -51,7 +49,6 @@
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"

-#include "utils/mcxt.h"

 static int	gimme_edge(Gene gene1, Gene gene2, Edge *edge_table);
 static void remove_gene(Gene gene, Edge edge, Edge *edge_table);
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: geqo_eval.c,v 1.39 1999/05/25 22:41:19 momjian Exp $
+ * $Id: geqo_eval.c,v 1.40 1999/07/15 15:19:11 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -34,8 +34,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"
 #include "utils/portal.h"

 #include "optimizer/internal.h"
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: geqo_main.c,v 1.16 1999/05/25 16:09:16 momjian Exp $
+ * $Id: geqo_main.c,v 1.17 1999/07/15 15:19:11 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -28,8 +28,6 @@
 #include "nodes/plannodes.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: geqo_misc.c,v 1.19 1999/05/25 22:41:20 momjian Exp $
+ * $Id: geqo_misc.c,v 1.20 1999/07/15 15:19:11 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -27,8 +27,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
--- a/src/backend/optimizer/geqo/geqo_mutation.c
+++ b/src/backend/optimizer/geqo/geqo_mutation.c
@ -4,7 +4,7 @@
 *
 *	 TSP mutation routines
 *
-* $Id: geqo_mutation.c,v 1.5 1999/02/13 23:16:09 momjian Exp $
+* $Id: geqo_mutation.c,v 1.6 1999/07/15 15:19:11 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -37,8 +37,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@ -6,7 +6,7 @@
 *	 OX1 operator according to Davis
 *	 (Proc Int'l Joint Conf on AI)
 *
-* $Id: geqo_ox1.c,v 1.5 1999/02/13 23:16:10 momjian Exp $
+* $Id: geqo_ox1.c,v 1.6 1999/07/15 15:19:12 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -39,8 +39,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@ -6,7 +6,7 @@
 *	 OX2 operator according to Syswerda
 *	 (The Genetic Algorithms Handbook, ed L Davis)
 *
-* $Id: geqo_ox2.c,v 1.5 1999/02/13 23:16:10 momjian Exp $
+* $Id: geqo_ox2.c,v 1.6 1999/07/15 15:19:12 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -39,8 +39,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
-* $Id: geqo_params.c,v 1.18 1999/07/14 01:19:51 momjian Exp $
+* $Id: geqo_params.c,v 1.19 1999/07/15 15:19:13 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -31,8 +31,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@ -45,7 +43,6 @@

 #include "storage/fd.h"

-#include "utils/mcxt.h"

 /*
 * Parameter values read from the config file (or defaulted) are stored here
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@ -6,7 +6,7 @@
 *	 PMX operator according to Goldberg & Lingle
 *	 (Proc Int'l Conf on GA's)
 *
-* $Id: geqo_pmx.c,v 1.6 1999/07/14 01:19:52 momjian Exp $
+* $Id: geqo_pmx.c,v 1.7 1999/07/15 15:19:13 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -39,8 +39,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@ -53,7 +51,6 @@
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"

-#include "utils/mcxt.h"

 /* pmx
 *
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: geqo_pool.c,v 1.13 1999/07/14 01:19:52 momjian Exp $
+ * $Id: geqo_pool.c,v 1.14 1999/07/15 15:19:14 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -26,8 +26,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@ -41,7 +39,6 @@
 #include "optimizer/geqo_copy.h"
 #include "optimizer/geqo_recombination.h"

-#include "utils/mcxt.h"

 static int	compare(const void *arg1, const void *arg2);

--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@ -6,7 +6,7 @@
 *	 PX operator according to Syswerda
 *	 (The Genetic Algorithms Handbook, L Davis, ed)
 *
-* $Id: geqo_px.c,v 1.6 1999/02/13 23:16:12 momjian Exp $
+* $Id: geqo_px.c,v 1.7 1999/07/15 15:19:14 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -39,8 +39,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
--- a/src/backend/optimizer/geqo/geqo_recombination.c
+++ b/src/backend/optimizer/geqo/geqo_recombination.c
@ -3,7 +3,7 @@
 * geqo_recombination.c
 *	 misc recombination procedures
 *
-* $Id: geqo_recombination.c,v 1.8 1999/07/14 01:19:53 momjian Exp $
+* $Id: geqo_recombination.c,v 1.9 1999/07/15 15:19:15 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -24,8 +24,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@ -38,7 +36,6 @@
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"

-#include "utils/mcxt.h"

 /*
 * init_tour
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: geqo_selection.c,v 1.7 1999/02/13 23:16:13 momjian Exp $
+ * $Id: geqo_selection.c,v 1.8 1999/07/15 15:19:15 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -41,8 +41,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
--- a/src/backend/optimizer/geqo/minspantree.c
+++ b/src/backend/optimizer/geqo/minspantree.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
-*	 $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.12 1999/05/25 22:41:22 momjian Exp $
+*	 $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.13 1999/07/15 15:19:15 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -20,7 +20,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"

-#include "utils/palloc.h"

 #include "optimizer/cost.h"

--- a/src/backend/optimizer/path/_deadcode/predmig.c
+++ b/src/backend/optimizer/path/_deadcode/predmig.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.4 1999/05/25 22:41:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.5 1999/07/15 15:19:19 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -39,9 +39,6 @@
 #include "nodes/nodes.h"
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
-#include "utils/palloc.h"
-#include "utils/elog.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/internal.h"
 #include "optimizer/cost.h"
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@ -9,7 +9,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.5 1999/07/03 00:32:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.6 1999/07/15 15:19:19 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -36,7 +36,6 @@
 #include "optimizer/keys.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/tlist.h"	/* for get_expr */
-#include "optimizer/xfunc.h"
 #include "storage/buf_internals.h"		/* for NBuffers */
 #include "tcop/dest.h"
 #include "utils/syscache.h"
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.46 1999/05/25 22:41:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.47 1999/07/15 15:19:17 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -25,7 +25,6 @@
 #include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/clauses.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/cost.h"

 #include "commands/creatinh.h"
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.57 1999/06/19 04:54:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.58 1999/07/15 15:19:18 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -37,7 +37,6 @@
 #include "optimizer/paths.h"
 #include "optimizer/plancat.h"
 #include "optimizer/pathnode.h"
-#include "optimizer/xfunc.h"
 #include "parser/parsetree.h"	/* for getrelid() */
 #include "parser/parse_expr.h"	/* for exprType() */
 #include "parser/parse_oper.h"	/* for oprid() and oper() */
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.25 1999/05/25 22:41:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.26 1999/07/15 15:19:18 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -26,7 +26,6 @@
 #include "optimizer/paths.h"
 #include "optimizer/cost.h"
 #include "optimizer/plancat.h"
-#include "optimizer/xfunc.h"

 #include "parser/parsetree.h"

--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.39 1999/05/25 22:41:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.40 1999/07/15 15:19:18 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -21,7 +21,6 @@
 #include "optimizer/paths.h"
 #include "optimizer/pathnode.h"

-#include "utils/elog.h"


 static List *merge_rel_with_same_relids(RelOptInfo *rel, Relids unjoined_relids);
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.57 1999/05/25 22:41:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.58 1999/07/15 15:19:20 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -28,7 +28,6 @@
 #include "nodes/makefuncs.h"

 #include "utils/lsyscache.h"
-#include "utils/palloc.h"
 #include "utils/builtins.h"

 #include "optimizer/restrictinfo.h"
@ -37,7 +36,6 @@
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
 #include "optimizer/planner.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/internal.h"


--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.31 1999/05/25 22:41:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.32 1999/07/15 15:19:22 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -26,7 +26,6 @@
 #include "catalog/pg_type.h"

 #include "utils/lsyscache.h"
-#include "utils/palloc.h"

 #include "optimizer/internal.h"
 #include "optimizer/planmain.h"
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.37 1999/06/12 19:38:30 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.38 1999/07/15 15:19:22 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -31,14 +31,10 @@
 #include "optimizer/keys.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/cost.h"

 #include "tcop/dest.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "nodes/memnodes.h"
-#include "utils/mcxt.h"
 #include "utils/lsyscache.h"

 static Plan *subplanner(Query *root, List *flat_tlist, List *qual);
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.57 1999/06/21 01:20:57 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.58 1999/07/15 15:19:23 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -24,7 +24,6 @@
 #include "catalog/pg_type.h"
 #include "parser/parse_expr.h"

-#include "utils/elog.h"
 #include "utils/lsyscache.h"
 #include "access/heapam.h"

--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.50 1999/06/06 17:38:10 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.51 1999/07/15 15:19:24 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -20,7 +20,6 @@
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"

-#include "utils/elog.h"
 #include "nodes/nodeFuncs.h"
 #include "nodes/makefuncs.h"

--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.22 1999/05/29 01:48:06 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.23 1999/07/15 15:19:25 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -25,7 +25,6 @@
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 #include "utils/lsyscache.h"
-#include "utils/palloc.h"
 #include "parser/parse_type.h"

 #include "parser/parsetree.h"	/* for getrelid() */
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.33 1999/06/10 06:55:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.34 1999/07/15 15:19:25 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -25,7 +25,6 @@
 #include "parser/parsetree.h"
 #include "parser/parse_clause.h"

-#include "utils/elog.h"
 #include "utils/lsyscache.h"

 #include "optimizer/internal.h"
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.21 1999/05/25 22:41:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.22 1999/07/15 15:19:26 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -15,7 +15,6 @@
 #include "nodes/pg_list.h"
 #include "nodes/nodes.h"
 #include "nodes/relation.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/keys.h"
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.42 1999/05/25 22:41:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.43 1999/07/15 15:19:26 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -16,7 +16,6 @@
 #include "postgres.h"

 #include "nodes/relation.h"
-#include "utils/elog.h"

 #include "optimizer/internal.h"
 #include "optimizer/pathnode.h"
@ -24,7 +23,6 @@
 #include "optimizer/plancat.h"
 #include "optimizer/cost.h"
 #include "optimizer/keys.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/ordering.h"

 #include "parser/parsetree.h"	/* for getrelid() */
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.33 1999/05/25 22:41:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.34 1999/07/15 15:19:27 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -17,7 +17,6 @@
 #include "nodes/primnodes.h"
 #include "nodes/pg_list.h"
 #include "nodes/nodeFuncs.h"
-#include "utils/elog.h"
 #include "utils/lsyscache.h"

 #include "optimizer/internal.h"
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- *	$Id: analyze.c,v 1.111 1999/07/13 21:17:32 momjian Exp $
+ *	$Id: analyze.c,v 1.112 1999/07/15 15:19:29 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -31,7 +31,6 @@
 #include "parse.h"

 #include "utils/builtins.h"
-#include "utils/mcxt.h"

 static Query *transformStmt(ParseState *pstate, Node *stmt);
 static Query *transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt);
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@ -10,7 +10,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.89 1999/07/13 21:17:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.90 1999/07/15 15:19:30 momjian Exp $
 *
 * HISTORY
 *	  AUTHOR			DATE			MAJOR EVENT
@ -42,14 +42,13 @@
 #include "parser/gramparse.h"
 #include "parser/parse_type.h"
 #include "utils/acl.h"
-#include "utils/palloc.h"
 #include "catalog/catname.h"
-#include "utils/elog.h"
 #include "access/xact.h"
 #include "storage/lmgr.h"
 #include "utils/numeric.h"
 #include "parser/analyze.h"
 #include "catalog/pg_type.h"
+#include "storage/bufpage.h"

 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.58 1999/07/13 21:17:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.59 1999/07/15 15:19:31 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -19,7 +19,6 @@
 #include "nodes/pg_list.h"
 #include "parse.h"
 #include "parser/keywords.h"
-#include "utils/elog.h"

 /*
 * List of (keyword-name, keyword-token-value) pairs.
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.37 1999/05/26 12:55:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.38 1999/07/15 15:19:31 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -27,7 +27,7 @@
 #include "parser/parse_target.h"
 #include "parser/parse_coerce.h"
 #include "nodes/print.h"
-
+#include "nodes/relation.h"
 #include "parse.h"


--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.25 1999/05/25 16:10:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.26 1999/07/15 15:19:31 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -26,6 +26,7 @@
 #include "parser/parse_coerce.h"
 #include "storage/bufmgr.h"
 #include "utils/syscache.h"
+#include "parser/parse_func.h"

 static Oid *oper_select_candidate(int nargs, Oid *input_typeids,
 					  CandidateList candidates);
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.22 1999/05/25 16:10:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.23 1999/07/15 15:19:32 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -24,6 +24,7 @@
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "parser/parse_type.h"

 static void checkTargetTypes(ParseState *pstate, char *target_colname,
 				 char *refname, char *colname);
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.13 1999/05/25 16:10:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.14 1999/07/15 15:19:32 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -21,7 +21,6 @@
 #include "postgres.h"
 #include "miscadmin.h"
 #include "parser/scansup.h"
-#include "utils/elog.h"

 /* ----------------
 *		scanstr
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@ -19,7 +19,6 @@
 #include <dld.h>
 #include "postgres.h"
 #include "dynloader.h"
-#include "utils/elog.h"
 #include "fmgr.h"

 extern char *pg_pathname;
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@ -10,7 +10,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.11 1999/02/21 03:49:13 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.12 1999/07/15 15:19:35 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -22,7 +22,6 @@
 #include <dld.h>
 #endif
 #include "dynloader.h"
-#include "utils/elog.h"
 #include "fmgr.h"

 #ifdef NOT_USED
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@ -9,7 +9,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.5 1999/02/13 23:17:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.6 1999/07/15 15:19:36 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@ -20,7 +20,6 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "port-protos.h"
-#include "utils/elog.h"

 extern char *pg_pathname;

--- a/src/backend/port/random.c
+++ b/src/backend/port/random.c
@ -1,12 +1,9 @@
-/* $Id: random.c,v 1.6 1999/02/07 22:07:02 tgl Exp $ */
+/* $Id: random.c,v 1.7 1999/07/15 15:19:33 momjian Exp $ */

 #include <stdlib.h>
 #include <math.h>				/* for pow() prototype */
 #include <errno.h>

-#include "config.h"
-#include "rusagestub.h"
-
 long
 random()
 {
--- a/src/backend/port/srandom.c
+++ b/src/backend/port/srandom.c
@ -1,12 +1,9 @@
-/* $Id: srandom.c,v 1.6 1999/02/07 22:07:02 tgl Exp $ */
+/* $Id: srandom.c,v 1.7 1999/07/15 15:19:34 momjian Exp $ */

 #include <stdlib.h>
 #include <math.h>				/* for pow() prototype */
 #include <errno.h>

-#include "config.h"
-#include "rusagestub.h"
-
 void
 srandom(unsigned int seed)
 {
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@ -10,7 +10,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.108 1999/07/07 17:17:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.109 1999/07/15 15:19:38 momjian Exp $
 *
 * NOTES
 *
@ -89,9 +89,7 @@
 #include "tcop/tcopprot.h"
 #include "commands/async.h"
 #include "nodes/nodes.h"
-#include "utils/mcxt.h"
 #include "storage/proc.h"
-#include "utils/elog.h"
 #ifndef HAVE_GETHOSTNAME
 #include "port-protos.h"		/* For gethostname() */
 #endif
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@ -6,12 +6,11 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.17 1999/02/13 23:17:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.18 1999/07/15 15:19:40 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
 #include "postgres.h"			/* for oid defs */
-#include "utils/elog.h"			/* for elog */
 #include "nodes/pg_list.h"		/* lisp support package */
 #include "nodes/parsenodes.h"
 #include "nodes/primnodes.h"	/* Var node def */
--- a/Show More
+++ b/Show More