diff options
Diffstat (limited to 'src')
23 files changed, 70 insertions, 92 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 73f7c943e58..777641477ee 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.123 1999/07/16 04:59:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.124 1999/07/16 05:23:18 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -42,6 +42,7 @@ #include <arpa/inet.h> #include <netdb.h> #ifdef __CYGWIN32__ +#include <getopt.h> #endif #include "commands/async.h" @@ -1495,7 +1496,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.123 $ $Date: 1999/07/16 04:59:53 $\n"); + puts("$Revision: 1.124 $ $Date: 1999/07/16 05:23:18 $\n"); } /* ---------------- @@ -1660,7 +1661,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) } #ifndef HAVE_GETRUSAGE -#else /* HAVE_GETRUSAGE */ +#include "rusagestub.h" +#else #include <sys/resource.h> #endif /* HAVE_GETRUSAGE */ diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 13899777a49..4fe29a46d38 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.59 1999/07/16 05:00:14 momjian Exp $ + * $Id: nabstime.c,v 1.60 1999/07/16 05:23:19 momjian Exp $ * */ #include <stdio.h> @@ -349,8 +349,6 @@ nabstimeout(AbsoluteTime time) break; default: abstime2tm(time, &tz, tm, tzn); -#if DATEDEBUG -#endif EncodeDateTime(tm, fsec, &tz, &tzn, DateStyle, buf); break; } diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index 61d96bc2f9d..871699ee7d7 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.29 1999/07/15 22:40:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.30 1999/07/16 05:23:19 momjian Exp $ * * NOTES * Eventually, the index information should go through here, too. @@ -16,11 +16,11 @@ #include <string.h> #include "postgres.h" -#include "utils/syscache.h" -#include "utils/lsyscache.h" #include "catalog/pg_operator.h" #include "catalog/pg_type.h" +#include "utils/lsyscache.h" +#include "utils/syscache.h" /* ---------- AMOP CACHES ---------- */ diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 3162d9a5508..4e147035606 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.65 1999/07/16 03:14:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.66 1999/07/16 05:23:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,8 +46,8 @@ #include "catalog/index.h" #include "catalog/indexing.h" #include "catalog/pg_attrdef.h" -#include "catalog/pg_proc.h" #include "catalog/pg_log.h" +#include "catalog/pg_proc.h" #include "catalog/pg_relcheck.h" #include "catalog/pg_rewrite.h" #include "catalog/pg_type.h" diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index fa57b86daf6..be33936a7eb 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.29 1999/07/15 22:40:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.30 1999/07/16 05:23:21 momjian Exp $ * * NOTES * These routines allow the parser/planner/executor to perform @@ -17,31 +17,25 @@ * *------------------------------------------------------------------------- */ +#include <string.h> #include "postgres.h" #include "access/heapam.h" #include "catalog/catname.h" -#include "utils/catcache.h" -#include <string.h> - - -/* ---------------- - * hardwired attribute information comes from system catalog files. - * ---------------- - */ +#include "catalog/pg_aggregate.h" #include "catalog/pg_amop.h" #include "catalog/pg_group.h" #include "catalog/pg_index.h" #include "catalog/pg_inherits.h" #include "catalog/pg_language.h" +#include "catalog/pg_listener.h" #include "catalog/pg_opclass.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" -#include "catalog/pg_type.h" #include "catalog/pg_rewrite.h" -#include "catalog/pg_aggregate.h" #include "catalog/pg_shadow.h" -#include "catalog/pg_listener.h" +#include "catalog/pg_type.h" +#include "utils/catcache.h" extern bool AMI_OVERRIDE; /* XXX style */ diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c index 9dfe2289d9f..54ca5844584 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.8 1999/07/15 22:40:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.9 1999/07/16 05:23:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,10 +26,10 @@ #include <string.h> #include "postgres.h" -#include "utils/temprel.h" #include "access/heapam.h" #include "catalog/heap.h" #include "catalog/index.h" +#include "utils/temprel.h" GlobalMemory CacheCxt; diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 283cb01b1f9..06dad245db5 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.45 1999/05/25 16:12:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.46 1999/07/16 05:23:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,14 +24,14 @@ #include <unistd.h> #include <signal.h> +#include "postgres.h" #ifdef USE_SYSLOG #include <syslog.h> #endif -#include "postgres.h" -#include "miscadmin.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" +#include "miscadmin.h" #include "storage/proc.h" #include "tcop/tcopprot.h" #include "utils/trace.h" diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c index 587371ff341..bc246eedf58 100644 --- a/src/backend/utils/error/exc.c +++ b/src/backend/utils/error/exc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.26 1999/07/16 03:14:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.27 1999/07/16 05:23:22 momjian Exp $ * * NOTE * XXX this code needs improvement--check for state violations and @@ -21,8 +21,8 @@ #include "postgres.h" -#include "utils/exc.h" #include "storage/ipc.h" +#include "utils/exc.h" static void ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 566a11aca83..49629fa5ce7 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.28 1999/07/15 22:40:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.29 1999/07/16 05:23:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,17 +18,12 @@ #include "postgres.h" -#include "utils/builtins.h" #include "access/heapam.h" - -#include "dynloader.h" - -#ifdef __ultrix -#endif - #include "catalog/catname.h" -#include "utils/syscache.h" #include "catalog/pg_proc.h" +#include "dynloader.h" +#include "utils/builtins.h" +#include "utils/syscache.h" static DynamicFileList *file_list = (DynamicFileList *) NULL; static DynamicFileList *file_tail = (DynamicFileList *) NULL; diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index fa3e2a6fd23..7575ae7d863 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.30 1999/07/15 22:40:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.31 1999/07/16 05:23:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,16 +17,12 @@ #include "postgres.h" -/* these 2 files are generated by Gen_fmgrtab.sh; contain the declarations */ -#include "utils/fmgrtab.h" - -#include "catalog/pg_proc.h" #include "catalog/pg_language.h" -#include "utils/syscache.h" - -#include "utils/builtins.h" - +#include "catalog/pg_proc.h" #include "commands/trigger.h" +#include "utils/builtins.h" +#include "utils/fmgrtab.h" +#include "utils/syscache.h" /* diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index 076799089dd..4d9b339cd84 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.25 1999/07/15 23:03:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.26 1999/07/16 05:23:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,8 +45,6 @@ #include "postgres.h" #include "utils/dynahash.h" #include "utils/hsearch.h" -#ifndef FRONTEND -#endif /* !FRONTEND */ #include "utils/memutils.h" /* diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 0f131fa4fe7..ae27be31ba3 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.34 1999/07/16 03:14:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.35 1999/07/16 05:23:25 momjian Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -24,12 +24,12 @@ #include <unistd.h> #include "postgres.h" -#include "miscadmin.h" +#include "catalog/catname.h" +#include "libpq/pqcomm.h" +#include "miscadmin.h" #include "storage/backendid.h" #include "storage/lmgr.h" -#include "libpq/pqcomm.h" -#include "catalog/catname.h" ProtocolVersion FrontendProtocol = PG_PROTOCOL_LATEST; diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 28a24bcc39a..0198850d295 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.32 1999/07/16 03:14:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.33 1999/07/16 05:23:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,10 +24,10 @@ #include "postgres.h" -#include "miscadmin.h" #include "catalog/catname.h" #include "catalog/pg_shadow.h" +#include "miscadmin.h" #include "utils/syscache.h" diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index d1bd79f4c08..111c49a6cec 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.44 1999/07/16 03:14:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.45 1999/07/16 05:23:26 momjian Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -35,28 +35,21 @@ #include <unistd.h> #include "postgres.h" -#include "version.h" - -#include "storage/backendid.h" -#include "storage/smgr.h" -#include "storage/proc.h" -#include "utils/relcache.h" #include "access/heapam.h" -#include "utils/syscache.h" +#include "catalog/catname.h" +#include "libpq/libpq.h" +#include "miscadmin.h" +#include "storage/backendid.h" #include "storage/bufpage.h" +#include "storage/proc.h" #include "storage/sinval.h" - -#include "miscadmin.h" -#include "utils/portal.h" - +#include "storage/smgr.h" #include "utils/inval.h" - -#include "catalog/catname.h" -#ifdef MULTIBYTE -#endif - -#include "libpq/libpq.h" +#include "utils/portal.h" +#include "utils/relcache.h" +#include "utils/syscache.h" +#include "version.h" static void VerifySystemDatabase(void); static void VerifyMyDatabase(void); diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c index 397cc766fc4..eb097e1b810 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.26 1999/07/15 22:40:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.27 1999/07/16 05:23:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,6 +25,7 @@ #include "utils/syscache.h" #ifdef MULTIBYTE +#include "mb/pg_wchar.h" #endif #ifdef NOT_USED diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c index b1dab2d4961..22263a3ab4a 100644 --- a/src/backend/utils/misc/superuser.c +++ b/src/backend/utils/misc/superuser.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.9 1999/07/15 23:03:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.10 1999/07/16 05:23:27 momjian Exp $ * * DESCRIPTION * See superuser(). @@ -16,8 +16,8 @@ */ #include "postgres.h" -#include "utils/syscache.h" #include "catalog/pg_shadow.h" +#include "utils/syscache.h" bool superuser(void) diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c index 229e373382c..27fbf486cc2 100644 --- a/src/backend/utils/misc/trace.c +++ b/src/backend/utils/misc/trace.c @@ -19,11 +19,12 @@ #include <sys/stat.h> #include <fcntl.h> +#include "postgres.h" + #ifdef USE_SYSLOG #include <syslog.h> #endif -#include "postgres.h" #include "miscadmin.h" #include "utils/trace.h" diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index c5ccc8df12e..bb5dedd6854 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.18 1999/07/16 03:14:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.19 1999/07/16 05:23:28 momjian Exp $ * * NOTE: * This is a new (Feb. 05, 1999) implementation of the allocation set @@ -25,6 +25,7 @@ #include "postgres.h" #include "utils/memutils.h" #ifndef HAVE_MEMMOVE +#include <regex/utils.h> #else #include <string.h> #endif diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index ff144e1f4fb..6a5f32b19e8 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.17 1999/07/16 03:14:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.18 1999/07/16 05:23:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,10 +15,9 @@ #include "postgres.h" -#include "utils/module.h" -#include "utils/excid.h" - #include "nodes/memnodes.h" +#include "utils/excid.h" +#include "utils/module.h" diff --git a/src/backend/utils/mmgr/oset.c b/src/backend/utils/mmgr/oset.c index e39e87ab84f..7863064f58e 100644 --- a/src/backend/utils/mmgr/oset.c +++ b/src/backend/utils/mmgr/oset.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.14 1999/07/16 03:14:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.15 1999/07/16 05:23:29 momjian Exp $ * * NOTE * XXX This is a preliminary implementation which lacks fail-fast diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index cb74992c97d..606e5839edb 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.26 1999/07/16 03:14:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.27 1999/07/16 05:23:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,10 +78,10 @@ #include "postgres.h" -#include "lib/hasht.h" -#include "utils/module.h" +#include "lib/hasht.h" +#include "utils/module.h" #include "utils/portal.h" static void CollectNamedPortals(Portal *portalP, int destroy); diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c index 2b349f36866..afabb4165f3 100644 --- a/src/backend/utils/sort/lselect.c +++ b/src/backend/utils/sort/lselect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.17 1999/07/15 22:40:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.18 1999/07/16 05:23:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,8 +17,8 @@ #include "postgres.h" -#include "access/heapam.h" +#include "access/heapam.h" #include "utils/lselect.h" /* diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c index b0c6db77177..40805818a70 100644 --- a/src/backend/utils/sort/psort.c +++ b/src/backend/utils/sort/psort.c @@ -4,7 +4,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: psort.c,v 1.54 1999/07/15 22:40:14 momjian Exp $ + * $Id: psort.c,v 1.55 1999/07/16 05:23:30 momjian Exp $ * * NOTES * Sorts the first relation into the second relation. @@ -37,11 +37,11 @@ #include <unistd.h> #include "postgres.h" -#include "miscadmin.h" #include "access/heapam.h" #include "executor/execdebug.h" #include "executor/executor.h" +#include "miscadmin.h" #include "utils/psort.h" static bool createfirstrun(Sort *node); |