diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 73f7c943e58c00f9c64d6da5a988f259ed462ade..777641477ee7731cb87191676c242a4e8b6d9576 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 13899777a496f4663e0c76be843667e48cbf04ed..4fe29a46d38eeefb1a5631f303e30d7f0191222e 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 61d96bc2f9d99ba8c9e47913a526642a783e1a48..871699ee7d7f278ed74666ff14af5503f6079705 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 3162d9a55085b0b6f30fd1d80375689394f529d4..4e147035606919790b74e17cbccbeccf05f608a3 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 fa57b86daf646820fda32aa68a7aba0f91bbcab9..be33936a7eb9d56504ab26dbfdc8da9f4c6853a8 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 9dfe2289d9fbba2da81fedab358ab6ecfe7b9ee0..54ca5844584532aaea97196f8049dd3fc7983b4f 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 283cb01b1f966711297fcf0fc9a80d328a1f8b52..06dad245db565387e8dc0908e3f32886e1fbeb48 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 587371ff3412ad45508a889c60d302710ca73d71..bc246eedf5819e297eb8039e7f50680e099c4c89 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 566a11aca83b19da3f006452111b112c46467d77..49629fa5ce7c99c74834ebb994de006d219b34ba 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 fa3e2a6fd234872d1fe0c8aee8e8e3b97ed0d91b..7575ae7d8639c967124de5803b81ca01f010f015 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 076799089dd9e7e03f5525a917d79f4bbf77257d..4d9b339cd84df1c432a79b2cd60a9ae912348c46 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 0f131fa4fe796c7afd5cc1f7b26e9f05dc6fd772..ae27be31ba391152d415fb20816f79a9c5cda26c 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 28a24bcc39a1b04a6a899cddb6e6757c19d4f704..0198850d29525cd1ca9bc866b1480f1e8fb1c13c 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 d1bd79f4c08e3fb36efba43bc4f69b46374fccb6..111c49a6cecdf916de50439c3015ecb248ce8bb3 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 397cc766fc4d7a0e3d3d5d1c3f4eb32f33aa6cc6..eb097e1b8108873046ef32b9afeedf0e9c233b9f 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 b1dab2d49613c87c5cecd693f4e6511873e864f7..22263a3ab4acb7bac4a796d01606d0b94b6eeb28 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 229e373382c13585d0c5cc154b4946774c74d05e..27fbf486cc24bb3cb135a55fba1f8652b537aa05 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 c5ccc8df12e4848dd8a8c1d780e085d878ccacbc..bb5dedd6854767c95b72f41793fbd9b2c91d2759 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 ff144e1f4fbcb4d2e80bede1fa06513970eb1790..6a5f32b19e82ce77ef90c41684cf9c00906b9331 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 e39e87ab84f3727c22e8ec3e3817014b9eaf618c..7863064f58e5b990f4f1b26ed5d74e5ea805f26d 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 cb74992c97d7f97bd8487f048fa96ac13acce571..606e5839edb363562f889096af9a9c65acb7daf7 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 2b349f36866784c70efc103cacaa15e4c4cabebc..afabb4165f330a9de0cb26c50fafcb8e090471db 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 b0c6db7717774f6decf8f4925502a373d057dd03..40805818a70c24e382faf72609937a18aa1208d4 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);