diff options
Diffstat (limited to 'src/backend')
168 files changed, 192 insertions, 416 deletions
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 06321990a8..bf2499fa05 100644 --- 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> diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c index fb52d42902..21321e8efc 100644 --- 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); diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c index 73f6e350de..3d420f8d2f 100644 --- 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> diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 75303fd37f..6c5bfa3531 100644 --- 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> diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c index b17a71cdd9..222af071dd 100644 --- 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> diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 293a32bfa8..59ebb29e2e 100644 --- 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 diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 07a72e131e..d71cf12d4a 100644 --- 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> diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 474b1593a8..436edadcf0 100644 --- 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> diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c index 577c2a4eeb..eea869776d 100644 --- 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 { diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 61dde4b9f0..17ac151acc 100644 --- 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> diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 6927f7e3c6..30aca9e088 100644 --- 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> diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index c682462ddd..5368c090f9 100644 --- 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; diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c index 1bfe10d325..7f2c4b9131 100644 --- 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> diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c index a685f692d0..36e971dc67 100644 --- 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> diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c index 6c3dba0056..1e473ded8b 100644 --- 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> diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index 03bb786f4b..5cbf8123e7 100644 --- 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> diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index cd860e0450..add151c30e 100644 --- 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> diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c index 58dfbecd22..017c042747 100644 --- 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; diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 6c7e7c16fa..15c684f756 100644 --- 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" diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 6e28f04759..e6486d336b 100644 --- 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" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 31747b2395..68abfc7b88 100644 --- 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" diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c index 58c87302d0..a8ce33d7bc 100644 --- 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" diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 3d31741cfe..9c79eec956 100644 --- 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> diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 29fb0d9a49..7eab1d213a 100644 --- 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> diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index ebd4fd0c29..0ff886ded5 100644 --- 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" diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index 34d322524c..6760ca9f2d 100644 --- 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); diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c index 061534054a..f88d29b7a0 100644 --- 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> diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index cc3d27599c..a710888d7f 100644 --- 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" diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index b5fa699981..e475fba1e2 100644 --- 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" diff --git a/src/backend/executor/_deadcode/nodeTee.c b/src/backend/executor/_deadcode/nodeTee.c index 38b830ea6a..dfe9fae775 100644 --- 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" diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c index 8e5f012fd8..2facc9096b 100644 --- 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" diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c index ba3741db02..bef6874861 100644 --- 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" diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index a3026fd30a..d6cd6b1f84 100644 --- 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); diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 58acc885ba..b6af1fe683 100644 --- 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" diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index 1ffe928b57..a41c4ff456 100644 --- 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); diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 2bd3d03bc6..0b7c220acc 100644 --- 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); diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index c32c14a596..00fc00182d 100644 --- 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" diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index a47a9ad549..44a14391b4 100644 --- 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" diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index c46b467caa..745269e071 100644 --- 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); diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 461bc1b8a5..57f2bb9d4d 100644 --- 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" diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c index 1ca99c1bef..3f118e90cf 100644 --- 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" diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c index 995dd5237a..fec4f25ecb 100644 --- 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 /* diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c index 2a0a6a04a0..9b232e705d 100644 --- 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> diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index 443c2db76d..871a7923a3 100644 --- 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> diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index 2fad684400..86f5ef2a99 100644 --- 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> diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index ab9b21392f..0f0ad4df29 100644 --- 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" diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 6a680190b2..6062857937 100644 --- 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); diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c index 0fa1906c96..4711d9b6fe 100644 --- 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" diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c index 256e041966..e58149d111 100644 --- 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 diff --git a/src/backend/nodes/nodes.c b/src/backend/nodes/nodes.c index 38220edd5d..c8c335df12 100644 --- 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 - diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index 1fdc83ecce..f73811431e 100644 --- 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" diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c index 3c2f1a3bd9..6da19489d0 100644 --- 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 - diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 09d2d1cdbf..de226c0118 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c index 8c9240b717..721671e702 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c index 92fca945e8..cf0c1027ed 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c index a5ab77202b..c58556f739 100644 --- 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); diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c index e572c65687..a3652e2d0b 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c index 88bcce1ed7..2b821b168d 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c index 206ec2567d..5c4079b12d 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c index a68b416bd4..bb007a259d 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c index 12b9b0d9b3..955379c270 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c index c98e5f8c23..ef3b03649d 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c index 76cbc45f07..e9bb76a1f9 100644 --- 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 diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c index 692ba09eab..330732b814 100644 --- 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 * diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c index 3a1b1030f6..79e237dc88 100644 --- 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); diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c index beaa2cfb57..983c01cfcc 100644 --- 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" diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c index 7afa5e41f3..f01b59a899 100644 --- 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 diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c index b42e4450f2..8c5301f10b 100644 --- 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" diff --git a/src/backend/optimizer/geqo/minspantree.c b/src/backend/optimizer/geqo/minspantree.c index 255602bcfa..9da3bdc5e9 100644 --- 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" diff --git a/src/backend/optimizer/path/_deadcode/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c index 9c57e16536..c47df87102 100644 --- 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" diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c index d77f9d2f10..2921372d6c 100644 --- 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" diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index d9b65c72fb..15c94a112f 100644 --- 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" diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index e1870912bf..b5666ffb7d 100644 --- 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() */ diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c index 0b9dd397d7..bbcb9e99da 100644 --- 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" diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c index ba8880daa2..f004bb0c90 100644 --- 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); diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index cc08b17bb2..17ab7e85c5 100644 --- 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" diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 059f52e5bf..947ec23da6 100644 --- 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" diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index 80eaaf9a05..924cb35062 100644 --- 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); diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 5165bf428b..ac145b5e17 100644 --- 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" diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 0ba84d3ba9..9d11dc4908 100644 --- 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" diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index c2ed4e0df1..7c132ec447 100644 --- 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() */ diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index 9ae2fb57a8..fae22f3262 100644 --- 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" diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c index 88236173a5..34d73bad80 100644 --- 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" diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 2cc98e7a87..3712db3d71 100644 --- 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() */ diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index 8a331a9905..a133e7a552 100644 --- 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" diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index e21af3abf3..59ae795f3a 100644 --- 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); diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 2619731075..b649f9e781 100644 --- 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" diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c index fd99a9613c..22b21f7056 100644 --- 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. diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index c91c9e9afb..a2bf9f080a 100644 --- 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" diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index 9f41d00b9e..f1db135955 100644 --- 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); diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index 3101f7ac7a..323334dddc 100644 --- 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); diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c index f32aee93f8..d2357a9260 100644 --- 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 diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c index fd1fbd73b8..88e8c0e0f8 100644 --- 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; diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c index 1ab5ff1afb..2d81ce9025 100644 --- 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 diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c index 96f2f20083..b21f9904bb 100644 --- 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; diff --git a/src/backend/port/random.c b/src/backend/port/random.c index 84b8293691..a14dee96ca 100644 --- 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() { diff --git a/src/backend/port/srandom.c b/src/backend/port/srandom.c index ed7cf4b7be..b1034f0279 100644 --- 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) { diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 4279963580..913768b2d1 100644 --- 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 diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c index c73cdd8784..609810ba5c 100644 --- 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 */ diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index cd0dd59c7f..27eef692d5 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.30 1999/07/04 05:16:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.31 1999/07/15 15:19:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ #include "access/heapam.h" /* access methods like amopenr */ #include "catalog/pg_rewrite.h" #include "nodes/parsenodes.h" -#include "nodes/pg_list.h" /* for Lisp support */ +#include "nodes/pg_list.h" #include "parser/parse_relation.h" #include "rewrite/locks.h" #include "rewrite/rewriteDefine.h" @@ -28,9 +28,9 @@ #include "rewrite/rewriteSupport.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" /* for get_typlen */ -#include "utils/rel.h" /* for Relation stuff */ - +#include "utils/lsyscache.h" +#include "utils/rel.h" +#include "storage/bufpage.h" Oid LastOidProcessed = InvalidOid; diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 4c525f4f9c..eafed074ad 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -6,20 +6,18 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.49 1999/07/13 21:17:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.50 1999/07/15 15:19:43 momjian Exp $ * *------------------------------------------------------------------------- */ #include <string.h> #include "postgres.h" #include "miscadmin.h" -#include "utils/palloc.h" -#include "utils/elog.h" #include "utils/rel.h" #include "nodes/pg_list.h" #include "nodes/primnodes.h" #include "nodes/relation.h" - +#include "parser/parse_type.h" #include "parser/parsetree.h" /* for parsetree manipulation */ #include "parser/parse_relation.h" #include "nodes/parsenodes.h" diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c index 50f1d8ec7f..feee3055c3 100644 --- a/src/backend/rewrite/rewriteManip.c +++ b/src/backend/rewrite/rewriteManip.c @@ -6,14 +6,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.33 1999/07/13 21:17:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.34 1999/07/15 15:19:43 momjian Exp $ * *------------------------------------------------------------------------- */ #include <string.h> #include "postgres.h" #include "nodes/pg_list.h" -#include "utils/elog.h" #include "nodes/nodes.h" #include "nodes/relation.h" #include "nodes/primnodes.h" diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index 79ad5afed7..305d2e49ac 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.32 1999/02/13 23:17:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.33 1999/07/15 15:19:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,6 @@ #include "storage/bufmgr.h" #include "utils/builtins.h" /* for textout */ #include "utils/catcache.h" /* for CacheContext */ -#include "utils/mcxt.h" /* MemoryContext stuff */ #include "utils/rel.h" /* for Relation, RelationData ... */ #include "utils/syscache.h" /* for SearchSysCache */ diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index e81b2dfb96..fa3914b61c 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.56 1999/06/29 04:54:47 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.57 1999/07/15 15:19:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,7 +64,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/hsearch.h" -#include "utils/palloc.h" #include "utils/memutils.h" #include "utils/relcache.h" #include "executor/execdebug.h" /* for NDirectFileRead */ diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index f39f55918f..ca2e754ca4 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -6,7 +6,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Id: fd.c,v 1.44 1999/07/14 01:19:53 momjian Exp $ + * $Id: fd.c,v 1.45 1999/07/15 15:19:47 momjian Exp $ * * NOTES: * @@ -49,10 +49,7 @@ #include "postgres.h" #include "miscadmin.h" /* for DataDir */ -#include "utils/palloc.h" #include "storage/fd.h" -#include "utils/elog.h" -#include "utils/mcxt.h" /* * Problem: Postgres does a system(ld...) to do dynamic loading. diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index e317c0e1ad..8213a84c14 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.42 1999/06/06 20:19:35 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.43 1999/07/15 15:19:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -69,6 +69,7 @@ #include "utils/memutils.h" #include "access/xact.h" #include "utils/tqual.h" +#include "access/transam.h" /* shared memory global variables */ diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c index 2ebda765a8..8a47ecaa42 100644 --- a/src/backend/storage/ipc/sinvaladt.c +++ b/src/backend/storage/ipc/sinvaladt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.20 1999/05/28 17:03:28 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.21 1999/07/15 15:19:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,6 @@ #include "storage/sinvaladt.h" #include "storage/lmgr.h" #include "utils/memutils.h" -#include "utils/palloc.h" #include "utils/trace.h" /* ---------------- diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index 58ee47fe61..2dce65a108 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.27 1999/06/10 14:17:11 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.28 1999/07/15 15:19:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,8 +35,6 @@ #include "storage/multilev.h" #include "storage/lmgr.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" #include "utils/rel.h" #include "catalog/catname.h" diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 2349e956a8..ba44c44de0 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.55 1999/05/29 06:14:42 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.56 1999/07/15 15:19:52 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -44,7 +44,6 @@ #include "storage/lock.h" #include "utils/hsearch.h" #include "utils/memutils.h" -#include "utils/palloc.h" #include "access/xact.h" #include "access/transam.h" #include "utils/trace.h" diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index 204c06302d..d33bd8c437 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.23 1999/07/03 00:32:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.24 1999/07/15 15:19:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,6 @@ #include "storage/item.h" #include "storage/buf.h" #include "storage/bufmgr.h" -#include "utils/palloc.h" #include "utils/memutils.h" #include "storage/bufpage.h" diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index b5d7b86c21..d94c0ef3f4 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.46 1999/06/18 16:47:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.47 1999/07/15 15:19:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,6 @@ #include "storage/block.h" #include "storage/fd.h" #include "storage/smgr.h" /* where the declarations go */ -#include "utils/mcxt.h" #include "utils/rel.h" #undef DIAGNOSTIC diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index f97a054130..5ed9e4965b 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.25 1999/07/14 01:19:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.26 1999/07/15 15:19:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,8 +21,6 @@ #include "storage/block.h" #include "storage/smgr.h" #include "utils/rel.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" static void smgrshutdown(int dummy); diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c index aa5eb72945..496346462c 100644 --- a/src/backend/storage/smgr/smgrtype.c +++ b/src/backend/storage/smgr/smgrtype.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.12 1999/07/14 01:19:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.13 1999/07/15 15:19:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,9 +15,7 @@ #include "postgres.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/palloc.h" #include "storage/smgr.h" -#include "utils/mcxt.h" typedef struct smgrid { diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index f9e96a2f27..967237bec2 100644 --- a/src/backend/tcop/dest.c +++ b/src/backend/tcop/dest.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.31 1999/05/25 22:42:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.32 1999/07/15 15:19:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,14 +42,12 @@ #include "libpq/pqformat.h" #include "access/printtup.h" #include "utils/portal.h" -#include "utils/palloc.h" #include "executor/executor.h" #include "tcop/dest.h" #include "catalog/pg_type.h" -#include "utils/mcxt.h" #include "commands/async.h" diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 23f2bd7a27..05b4ef9054 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.24 1999/05/10 00:45:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.25 1999/07/15 15:19:59 momjian Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -63,7 +63,6 @@ #include "tcop/tcopdebug.h" -#include "utils/palloc.h" #include "fmgr.h" #include "utils/builtins.h" /* for oideq */ #include "tcop/fastpath.h" diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 74c407ecd8..a17f0ebd43 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.119 1999/07/02 18:09:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.120 1999/07/15 15:19:59 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -69,7 +69,6 @@ #include "tcop/tcopdebug.h" #include "tcop/tcopprot.h" /* where declarations for this file go */ #include "tcop/utility.h" -#include "utils/mcxt.h" #include "utils/rel.h" #include "utils/ps_status.h" #include "utils/temprel.h" @@ -81,10 +80,6 @@ #endif #ifdef NOT_USED -#include "optimizer/xfunc.h" -#endif - -#ifdef NOT_USED #include "nodes/plannodes.h" #endif @@ -1525,7 +1520,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.119 $ $Date: 1999/07/02 18:09:27 $\n"); + puts("$Revision: 1.120 $ $Date: 1999/07/15 15:19:59 $\n"); } /* ---------------- diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 83c400188f..e73de6d9bd 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.23 1999/05/25 16:11:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.24 1999/07/15 15:20:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,9 +17,7 @@ #include "tcop/tcopdebug.h" -#include "utils/palloc.h" #include "nodes/nodes.h" -#include "utils/mcxt.h" #include "miscadmin.h" #include "utils/portal.h" diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 38099254bf..970e47db3b 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.61 1999/05/25 16:11:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.62 1999/07/15 15:20:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,6 @@ #include "../backend/parser/parse.h" #include "utils/builtins.h" #include "utils/acl.h" -#include "utils/palloc.h" #include "rewrite/rewriteRemove.h" #include "rewrite/rewriteDefine.h" #include "tcop/tcopdebug.h" diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h index b5faa82cb2..515d488e9f 100644 --- a/src/backend/tioga/tgRecipe.h +++ b/src/backend/tioga/tgRecipe.h @@ -11,7 +11,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tgRecipe.h,v 1.11 1999/05/25 22:42:09 momjian Exp $ + * $Id: tgRecipe.h,v 1.12 1999/07/15 15:20:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,6 @@ #include "libpq/libpq.h" #ifndef TIOGA_FRONTEND #include "libpq/libpq-be.h" -#include "utils/elog.h" #include "utils/geo-decls.h" #else #include "libpq-fe.h" diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index b0e59e3ff0..0d97bb0a1c 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.43 1999/05/25 16:11:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.44 1999/07/15 15:20:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,6 @@ #include "storage/fd.h" #include "fmgr.h" #include "utils/array.h" -#include "utils/elog.h" #include "libpq/libpq-fs.h" #include "libpq/be-fsstubs.h" diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c index a0fe502895..4514a3bcc5 100644 --- a/src/backend/utils/adt/arrayutils.c +++ b/src/backend/utils/adt/arrayutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.7 1999/02/13 23:19:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.8 1999/07/15 15:20:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,8 +16,6 @@ #include "postgres.h" -#include "utils/array.h" - int GetOffset(int n, int *dim, int *lb, int *indx) { diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c index d0ac12f4f2..a05ababecb 100644 --- a/src/backend/utils/adt/bool.c +++ b/src/backend/utils/adt/bool.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.17 1999/07/14 01:19:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.18 1999/07/15 15:20:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,8 +16,6 @@ #include "postgres.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/palloc.h" -#include "utils/mcxt.h" /***************************************************************************** * USER I/O ROUTINES * diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index dd363ee083..6cfa052055 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -9,7 +9,7 @@ * workings can be found in the book "Software Solutions in C" by * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7. * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.29 1999/07/14 01:19:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.30 1999/07/15 15:20:11 momjian Exp $ */ #include <stdio.h> @@ -22,7 +22,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/cash.h" -#include "utils/mcxt.h" static const char *num_word(Cash value); diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c index 9eaa721b49..97f0c22f2a 100644 --- a/src/backend/utils/adt/char.c +++ b/src/backend/utils/adt/char.c @@ -8,16 +8,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.23 1999/07/14 01:19:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.24 1999/07/15 15:20:12 momjian Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> /* for sprintf() */ #include <string.h> #include "postgres.h" -#include "utils/palloc.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/mcxt.h" /***************************************************************************** * USER I/O ROUTINES * diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index b4a2519831..c3feaa5063 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.33 1999/07/14 01:19:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.34 1999/07/15 15:20:13 momjian Exp $ * * NOTES * This code is actually (almost) unused. @@ -40,9 +40,7 @@ #endif #include "access/xact.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/palloc.h" #include "utils/dt.h" -#include "utils/mcxt.h" #define INVALID_RELTIME_STR "Undefined RelTime" #define INVALID_RELTIME_STR_LEN (sizeof(INVALID_RELTIME_STR)-1) diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 5962460280..0c87ce5a64 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.34 1999/07/14 01:19:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.35 1999/07/15 15:20:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,6 @@ #include "utils/nabstime.h" #include "utils/datetime.h" #include "access/xact.h" -#include "utils/mcxt.h" static int date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn); diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c index bfdd61271a..1c774616d5 100644 --- a/src/backend/utils/adt/datum.c +++ b/src/backend/utils/adt/datum.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.13 1999/07/14 01:20:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.14 1999/07/15 15:20:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,8 +31,6 @@ #include "postgres.h" #include "utils/datum.h" #include "catalog/pg_type.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" /*------------------------------------------------------------------------- * datumGetSize diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c index 3040cf0b31..6e6dc717eb 100644 --- a/src/backend/utils/adt/dt.c +++ b/src/backend/utils/adt/dt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.73 1999/07/14 01:20:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.74 1999/07/15 15:20:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,6 @@ #include <sys/timeb.h> #endif #include "utils/builtins.h" -#include "utils/mcxt.h" static int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm); static int DecodeNumber(int flen, char *field, diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c index be224f1bf7..0b2c0dd250 100644 --- a/src/backend/utils/adt/filename.c +++ b/src/backend/utils/adt/filename.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.18 1999/07/14 01:20:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.19 1999/07/15 15:20:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,6 @@ #include "postgres.h" #include <miscadmin.h> #include "utils/builtins.h" /* where function declarations go */ -#include "utils/mcxt.h" char * filename_in(char *file) diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index 6b4eb7af61..daf830e552 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.44 1999/07/14 01:20:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.45 1999/07/15 15:20:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,8 +61,6 @@ #endif #include "fmgr.h" #include "utils/builtins.h" /* for ftod() prototype */ -#include "utils/palloc.h" -#include "utils/mcxt.h" #ifndef NAN #define NAN (0.0/0.0) diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index 1b3fc643e1..743a823c2a 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.42 1999/07/14 01:20:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.43 1999/07/15 15:20:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,8 +22,6 @@ #include "postgres.h" #include "utils/geo_decls.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" #ifndef PI #define PI 3.1415926536 diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c index 083f3e2e40..4a246d705f 100644 --- a/src/backend/utils/adt/geo_selfuncs.c +++ b/src/backend/utils/adt/geo_selfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.9 1999/07/14 01:20:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.10 1999/07/15 15:20:17 momjian Exp $ * * XXX These are totally bogus. * @@ -18,9 +18,7 @@ #include "access/attnum.h" #include "utils/geo_decls.h" /* where function declarations go */ -#include "utils/palloc.h" #include "utils/builtins.h" -#include "utils/mcxt.h" float64 areasel(Oid opid, diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index d66f9240bd..f26dc35a8a 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.22 1999/07/14 01:20:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.23 1999/07/15 15:20:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,6 @@ #include "postgres.h" #include "fmgr.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/mcxt.h" #ifndef SHRT_MAX #define SHRT_MAX (0x7FFF) diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index d8170dcd2e..6b2be8a5a0 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -15,9 +15,7 @@ #include <limits.h> #include "postgres.h" -#include "utils/palloc.h" #include "utils/int8.h" -#include "utils/mcxt.h" #define MAXINT8LEN 25 diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 7586b63769..09925bb830 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -19,10 +19,8 @@ */ #include <string.h> #include "postgres.h" /* postgres system include file */ -#include "utils/palloc.h" #include "utils/builtins.h" /* where the function declarations go */ #include "mb/pg_wchar.h" -#include "utils/mcxt.h" static int like(pg_wchar * text, pg_wchar * p); @@ -112,7 +110,7 @@ textnlike(struct varlena * s, struct varlena * p) } -/* $Revision: 1.26 $ +/* $Revision: 1.27 $ ** "like.c" A first attempt at a LIKE operator for Postgres95. ** ** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986. diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c index 96588d9711..03a7a4e479 100644 --- a/src/backend/utils/adt/mac.c +++ b/src/backend/utils/adt/mac.c @@ -1,17 +1,15 @@ /* * PostgreSQL type definitions for MAC addresses. * - * $Id: mac.c,v 1.9 1999/07/14 01:20:05 momjian Exp $ + * $Id: mac.c,v 1.10 1999/07/15 15:20:18 momjian Exp $ */ #include <stdio.h> #include <string.h> #include <postgres.h> -#include <utils/palloc.h> #include <utils/builtins.h> #include <utils/inet.h> -#include "utils/mcxt.h" manufacturer manufacturers[] = { {0x00, 0x00, 0x0C, "Cisco"}, diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 4af6f1216c..304e91d206 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -4,7 +4,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.c,v 1.56 1999/07/14 01:20:05 momjian Exp $ + * $Id: nabstime.c,v 1.57 1999/07/15 15:20:18 momjian Exp $ * */ #include <stdio.h> @@ -25,7 +25,6 @@ #endif #include "utils/builtins.h" #include "access/xact.h" -#include "utils/mcxt.h" static AbsoluteTime tm2abstime(struct tm * tm, int tz); diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index c0b403099a..e04ad84cc6 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -11,15 +11,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.19 1999/07/14 01:20:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.20 1999/07/15 15:20:18 momjian Exp $ * *------------------------------------------------------------------------- */ #include <string.h> #include "postgres.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/palloc.h" /* where the declarations go */ -#include "utils/mcxt.h" /***************************************************************************** * USER I/O ROUTINES (none) * diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c index 0bbc185f90..1b56dfa4cb 100644 --- a/src/backend/utils/adt/network.c +++ b/src/backend/utils/adt/network.c @@ -3,7 +3,7 @@ * is for IP V4 CIDR notation, but prepared for V6: just * add the necessary bits where the comments indicate. * - * $Id: network.c,v 1.11 1999/07/14 01:20:06 momjian Exp $ + * $Id: network.c,v 1.12 1999/07/15 15:20:18 momjian Exp $ * Jon Postel RIP 16 Oct 1998 */ @@ -18,10 +18,8 @@ #include <arpa/inet.h> #include <postgres.h> -#include <utils/palloc.h> #include <utils/builtins.h> #include <utils/inet.h> -#include "utils/mcxt.h" static int v4bitncmp(unsigned int a1, unsigned int a2, int bits); diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index e1063adf67..cfe6beaff7 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.17 1999/07/14 01:20:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.18 1999/07/15 15:20:18 momjian Exp $ * * ---------- */ @@ -21,9 +21,7 @@ #include "postgres.h" #include "utils/builtins.h" -#include "utils/palloc.h" #include "utils/numeric.h" -#include "utils/mcxt.h" /* ---------- * Uncomment the following to enable compilation of dump_numeric() diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index 3ddc4534ec..ec55bcd451 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.24 1999/07/14 01:20:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.25 1999/07/15 15:20:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,6 @@ #include "postgres.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/mcxt.h" /***************************************************************************** * USER I/O ROUTINES * diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c index 205477ce47..50be811b22 100644 --- a/src/backend/utils/adt/oracle_compat.c +++ b/src/backend/utils/adt/oracle_compat.c @@ -1,14 +1,13 @@ /* * Edmund Mergl <E.Mergl@bawue.de> * - * $Id: oracle_compat.c,v 1.19 1999/07/14 01:20:06 momjian Exp $ + * $Id: oracle_compat.c,v 1.20 1999/07/15 15:20:19 momjian Exp $ * */ #include <ctype.h> #include "postgres.h" -#include "utils/mcxt.h" text *lower(text *string); text *upper(text *string); diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index daf8cb1e69..c53b535011 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.23 1999/07/14 01:20:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.24 1999/07/15 15:20:19 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -33,7 +33,6 @@ #include <regex/regex.h> #include "utils/builtins.h" /* where the function declarations go */ -#include "utils/mcxt.h" #if defined(DISABLE_XOPEN_NLS) #undef _XOPEN_SOURCE diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 1db8ddcc05..3a2a032364 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.37 1999/05/25 16:12:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.38 1999/07/15 15:20:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,6 @@ #include "access/relscan.h" #include "storage/bufmgr.h" #include "fmgr.h" -#include "utils/palloc.h" #include "utils/syscache.h" #include "catalog/catname.h" diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 6df5fb04ad..928705ef22 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * out of it's tuple * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.18 1999/06/02 11:52:28 wieck Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.19 1999/07/15 15:20:19 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -44,7 +44,6 @@ #include "executor/spi.h" #include "commands/trigger.h" -#include "utils/elog.h" #include "utils/builtins.h" #include "nodes/nodes.h" #include "optimizer/clauses.h" diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index fe11c77b19..359267653b 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.30 1999/06/19 00:44:44 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.31 1999/07/15 15:20:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,6 @@ #include "fmgr.h" #include "utils/builtins.h" /* for textout() prototype and where the * declarations go */ -#include "utils/palloc.h" #include "catalog/catname.h" #include "utils/syscache.h" diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index 60c368502b..5a9bae512e 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.7 1999/07/14 01:20:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.8 1999/07/15 15:20:20 momjian Exp $ * * NOTES * input routine largely stolen from boxin(). @@ -19,9 +19,7 @@ #include "postgres.h" #include "storage/bufpage.h" -#include "utils/palloc.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/mcxt.h" #define LDELIM '(' #define RDELIM ')' diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 6e1da178da..3c67ab854e 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -6,7 +6,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "access/xact.h" -#include "utils/mcxt.h" time_t timestamp_in(const char *timestamp_str) diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index d7bb2738cb..868412f46f 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.48 1999/07/04 04:56:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.49 1999/07/15 15:20:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,11 @@ #include "utils/array.h" #include "utils/builtins.h" #include "catalog/pg_type.h" +#include "storage/bufpage.h" +#include "utils/memutils.h" #ifdef CYR_RECODE char *convertstr(char *, int, int); - #endif #include "mb/pg_wchar.h" diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index e31d5f4d3d..61b07f97fe 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.49 1999/07/14 01:20:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.50 1999/07/15 15:20:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,9 +15,7 @@ #include <string.h> #include "postgres.h" -#include "utils/palloc.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/mcxt.h" #include "mb/pg_wchar.h" diff --git a/src/backend/utils/adt/version.c b/src/backend/utils/adt/version.c index 98e76f78a5..a756a2ca9c 100644 --- a/src/backend/utils/adt/version.c +++ b/src/backend/utils/adt/version.c @@ -5,7 +5,7 @@ * * IDENTIFICATION * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.7 1999/07/14 01:20:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.8 1999/07/15 15:20:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #include "postgres.h" #include "version.h" -#include "utils/mcxt.h" text *version(void); diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 8224c93578..c4044158ea 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.43 1999/06/04 02:19:45 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.44 1999/07/15 15:20:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,9 +19,6 @@ #include "utils/builtins.h" #include "utils/portal.h" #include "utils/catcache.h" -#include "utils/elog.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" #include "utils/rel.h" #include "storage/bufpage.h" #include "access/valid.h" diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index be59004441..cb99900ea6 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.27 1999/05/29 01:45:21 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.28 1999/07/15 15:20:22 momjian Exp $ * * NOTES * Eventually, the index information should go through here, too. @@ -21,8 +21,6 @@ #include "utils/lsyscache.h" #include "access/tupmacs.h" #include "utils/rel.h" -#include "utils/palloc.h" -#include "utils/elog.h" #include "access/attnum.h" #include "access/heapam.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index f8c73b7b22..7184f76985 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.62 1999/05/25 16:12:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.63 1999/07/15 15:20:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,7 +73,6 @@ #include "utils/builtins.h" #include "utils/catcache.h" #include "utils/hsearch.h" -#include "utils/mcxt.h" #include "utils/memutils.h" #include "utils/rel.h" #include "utils/relcache.h" diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c index 6635ac2bd4..0d817ec012 100644 --- a/src/backend/utils/cache/temprel.c +++ b/src/backend/utils/cache/temprel.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.6 1999/07/03 15:43:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.7 1999/07/15 15:20:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,6 @@ #include "postgres.h" #include "miscadmin.h" #include "nodes/pg_list.h" -#include "utils/mcxt.h" #include "utils/temprel.h" #include "access/xact.h" #include "access/htup.h" diff --git a/src/backend/utils/error/excid.c b/src/backend/utils/error/excid.c index 70842f3b56..c22b8e696c 100644 --- a/src/backend/utils/error/excid.c +++ b/src/backend/utils/error/excid.c @@ -7,15 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.6 1999/05/25 16:12:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.7 1999/07/15 15:20:26 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "utils/excid.h" - /***************************************************************************** * Generic Recoverable Exceptions * *****************************************************************************/ diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 7d9b79575f..b5cf429e7f 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.26 1999/05/25 16:12:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.27 1999/07/15 15:20:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,6 @@ #include "config.h" /* for MAXPATHLEN */ #include "fmgr.h" /* generated by Gen_fmgrtab.sh */ #include "utils/dynamic_loader.h" -#include "utils/elog.h" #include "utils/builtins.h" #include "access/heapam.h" #include "nodes/pg_list.h" diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index d5b24cf341..8658da21a4 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.28 1999/05/25 16:12:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.29 1999/07/15 15:20:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,6 @@ #include "nodes/params.h" #include "utils/builtins.h" -#include "utils/elog.h" #include "nodes/parsenodes.h" #include "commands/trigger.h" diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index 28ee6a15de..5b00ed9b0f 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.23 1999/05/31 17:01:52 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.24 1999/07/15 15:20:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,9 +46,7 @@ #include "utils/dynahash.h" #include "utils/hsearch.h" #ifndef FRONTEND -#include "utils/mcxt.h" #endif /* !FRONTEND */ -#include "utils/palloc.h" #include "utils/memutils.h" /* diff --git a/src/backend/utils/init/enbl.c b/src/backend/utils/init/enbl.c index 78c5ab1040..f2ac69fba7 100644 --- a/src/backend/utils/init/enbl.c +++ b/src/backend/utils/init/enbl.c @@ -7,12 +7,11 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.7 1999/05/25 16:12:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.8 1999/07/15 15:20:32 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "utils/module.h" /* where the declarations go */ /* * BypassEnable diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 1d4225e582..1ef5a00fe4 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.30 1999/05/25 16:12:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.31 1999/07/15 15:20:34 momjian Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -31,7 +31,6 @@ #include "storage/sinval.h" #include "storage/sinvaladt.h" #include "storage/lmgr.h" -#include "utils/elog.h" #include "libpq/pqcomm.h" #include "catalog/catname.h" diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 86328bbd56..53e98f3211 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.29 1999/05/25 16:12:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.30 1999/07/15 15:20:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,8 +25,6 @@ #include "utils/portal.h" /* for EnablePortalManager, etc. */ #include "utils/exc.h" /* for EnableExceptionHandling, etc. */ -#include "utils/mcxt.h" /* for EnableMemoryContext, etc. */ -#include "utils/elog.h" #include "utils/builtins.h" #include "miscadmin.h" /* where the declarations go */ diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 0c2711483f..6a304ec3d1 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.40 1999/05/25 16:12:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.41 1999/07/15 15:20:34 momjian Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -60,9 +60,6 @@ #include "utils/exc.h" /* for EnableExceptionHandling, etc. */ #include "fmgr.h" /* for EnableDynamicFunctionManager, etc. */ -#include "utils/elog.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" /* for EnableMemoryContext, etc. */ #include "utils/inval.h" #include "catalog/catname.h" diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c index e9ea619349..607dfcf46a 100644 --- a/src/backend/utils/misc/database.c +++ b/src/backend/utils/misc/database.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.24 1999/05/25 16:12:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.25 1999/07/15 15:20:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/transam.h" #include "access/xact.h" #include "catalog/catname.h" #include "catalog/pg_database.h" diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 98cd5b6f16..8143bc2c3e 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.14 1999/05/25 16:12:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.15 1999/07/15 15:20:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,10 +22,7 @@ #include "nodes/memnodes.h" #include "nodes/nodes.h" -#include "utils/mcxt.h" -#include "utils/elog.h" -#include "utils/palloc.h" #undef MemoryContextAlloc #undef MemoryContextFree diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c index bf36908973..4eb27ccbc6 100644 --- a/src/backend/utils/mmgr/palloc.c +++ b/src/backend/utils/mmgr/palloc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.12 1999/05/25 16:12:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.13 1999/07/15 15:20:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,9 +16,6 @@ #include "postgres.h" -#include "utils/mcxt.h" -#include "utils/elog.h" -#include "utils/palloc.h" #include "nodes/memnodes.h" diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 2c800e033c..55512b1c95 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.23 1999/06/19 05:00:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.24 1999/07/15 15:20:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -81,7 +81,6 @@ #include "lib/hasht.h" #include "utils/module.h" #include "utils/excid.h" /* for Unimplemented */ -#include "utils/mcxt.h" #include "utils/hsearch.h" #include "nodes/memnodes.h" diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c index 104e57b919..b89706638a 100644 --- a/src/backend/utils/time/tqual.c +++ b/src/backend/utils/time/tqual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.29 1999/05/25 16:13:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.30 1999/07/15 15:20:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,8 +20,6 @@ #include "access/xact.h" #include "storage/bufmgr.h" #include "access/transam.h" -#include "utils/elog.h" -#include "utils/palloc.h" #include "utils/tqual.h" extern bool PostgresIsInitialized; |