20 files changed, 88 insertions, 91 deletions
diff --git a/src/backend/executor/_deadcode/nodeTee.c b/src/backend/executor/_deadcode/nodeTee.c
index dfe9fae7756..7cab4084a86 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.4 1999/07/15 15:19:02 momjian Exp $
+ *	$Id: nodeTee.c,v 1.5 1999/07/16 04:58:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,16 +23,16 @@
 #include <sys/file.h>
 #include "postgres.h"
 
-#include "utils/relcache.h"
-#include "storage/bufmgr.h"
-#include "storage/smgr.h"
-#include "optimizer/internal.h"
-#include "executor/executor.h"
-#include "executor/nodeTee.h"
+#include "access/heapam.h"
 #include "catalog/catalog.h"
 #include "catalog/heap.h"
+#include "executor/executor.h"
+#include "executor/nodeTee.h"
+#include "optimizer/internal.h"
+#include "storage/bufmgr.h"
+#include "storage/smgr.h"
 #include "tcop/pquery.h"
-#include "access/heapam.h"
+#include "utils/relcache.h"
 
 /* ------------------------------------------------------------------
  *		ExecInitTee
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 0573d647ea5..8a03d92abae 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.39 1999/07/16 03:12:50 momjian Exp $
+ *	$Id: execAmi.c,v 1.40 1999/07/16 04:58:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,28 +28,28 @@
 
 #include "postgres.h"
 
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "catalog/heap.h"
+#include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "executor/nodeSeqscan.h"
+#include "executor/nodeAgg.h"
+#include "executor/nodeAppend.h"
+#include "executor/nodeGroup.h"
+#include "executor/nodeGroup.h"
+#include "executor/nodeHash.h"
+#include "executor/nodeHashjoin.h"
 #include "executor/nodeIndexscan.h"
-#include "executor/nodeSort.h"
 #include "executor/nodeMaterial.h"
+#include "executor/nodeMergejoin.h"
 #include "executor/nodeNestloop.h"
-#include "executor/nodeHashjoin.h"
-#include "executor/nodeHash.h"
-#include "executor/nodeGroup.h"
-
-#include "executor/nodeAgg.h"
-#include "executor/nodeGroup.h"
 #include "executor/nodeResult.h"
-#include "executor/nodeUnique.h"
-#include "executor/nodeMergejoin.h"
-#include "executor/nodeAppend.h"
+#include "executor/nodeSeqscan.h"
+#include "executor/nodeSort.h"
 #include "executor/nodeSubplan.h"
-#include "executor/execdebug.h"
+#include "executor/nodeUnique.h"
 #include "optimizer/internal.h"
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "catalog/heap.h"
 
 static Pointer ExecBeginScan(Relation relation, int nkeys, ScanKey skeys,
 			  bool isindex, ScanDirection dir, Snapshot snapshot);
diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c
index 8a8d049f317..1c377542b69 100644
--- a/src/backend/executor/execFlatten.c
+++ b/src/backend/executor/execFlatten.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.10 1999/07/15 22:39:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.11 1999/07/16 04:58:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,8 +26,8 @@
  *	 node does the actual flattening work.
  */
 #include "postgres.h"
-#include "executor/executor.h"
 #include "executor/execFlatten.h"
+#include "executor/executor.h"
 
 #ifdef SETS_FIXED
 static bool FjoinBumpOuterNodes(TargetEntry *tlist, ExprContext *econtext,
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 8f1755356a2..5459f06be85 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,26 +26,25 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.91 1999/07/16 03:12:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.92 1999/07/16 04:58:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
-#include "miscadmin.h"
 
-#include "executor/executor.h"
-#include "executor/execdefs.h"
-#include "executor/execdebug.h"
-#include "utils/builtins.h"
-#include "utils/acl.h"
-#include "utils/syscache.h"
-#include "parser/parsetree.h"
-/* #include "access/localam.h" */
-#include "optimizer/var.h"
 #include "access/heapam.h"
 #include "catalog/heap.h"
 #include "commands/trigger.h"
+#include "executor/execdebug.h"
+#include "executor/execdefs.h"
+#include "executor/executor.h"
+#include "miscadmin.h"
+#include "optimizer/var.h"
+#include "parser/parsetree.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
 			   Query *parseTree);
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index 1b693cbcaf1..1b6d2bd8421 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.14 1999/03/23 16:50:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.15 1999/07/16 04:58:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,23 +74,23 @@
  */
 #include "postgres.h"
 
-#include "miscadmin.h"
-#include "tcop/tcopprot.h"
 #include "executor/executor.h"
-#include "executor/nodeResult.h"
+#include "executor/nodeAgg.h"
 #include "executor/nodeAppend.h"
-#include "executor/nodeSeqscan.h"
-#include "executor/nodeIndexscan.h"
-#include "executor/nodeNestloop.h"
-#include "executor/nodeMergejoin.h"
-#include "executor/nodeMaterial.h"
-#include "executor/nodeSort.h"
-#include "executor/nodeUnique.h"
 #include "executor/nodeGroup.h"
-#include "executor/nodeAgg.h"
 #include "executor/nodeHash.h"
 #include "executor/nodeHashjoin.h"
+#include "executor/nodeIndexscan.h"
+#include "executor/nodeMaterial.h"
+#include "executor/nodeMergejoin.h"
+#include "executor/nodeNestloop.h"
+#include "executor/nodeResult.h"
+#include "executor/nodeSeqscan.h"
+#include "executor/nodeSort.h"
 #include "executor/nodeSubplan.h"
+#include "executor/nodeUnique.h"
+#include "miscadmin.h"
+#include "tcop/tcopprot.h"
 
 /* ------------------------------------------------------------------------
  *		ExecInitNode
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index d5a218a7ce3..3eb569acb64 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.55 1999/07/15 22:39:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.56 1999/07/16 04:58:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,9 +35,9 @@
 
 #include "access/heapam.h"
 #include "catalog/pg_language.h"
+#include "executor/execFlatten.h"
 #include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "executor/execFlatten.h"
 #include "executor/functions.h"
 #include "executor/nodeSubplan.h"
 #include "utils/builtins.h"
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 33d7f0bd635..bebcb17a977 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.27 1999/07/15 22:39:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.28 1999/07/16 04:58:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -119,9 +119,8 @@
 #include <string.h>
 
 #include "postgres.h"
-
-
 #include "executor/executor.h"
+
 #undef ExecStoreTuple
 
 #include "catalog/pg_type.h"
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 6d2fb86f45f..4bacf3f7bdb 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.47 1999/07/15 22:39:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.48 1999/07/16 04:58:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,9 +46,9 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/index.h"
+#include "catalog/pg_index.h"
 #include "executor/execdebug.h"
 #include "executor/executor.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 1fbd578da8d..0653c048b9b 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,22 +8,21 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.28 1999/07/15 22:39:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.29 1999/07/16 04:58:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 
-
+#include "access/heapam.h"
+#include "executor/execdefs.h"
+#include "executor/executor.h"
+#include "executor/functions.h"
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"
 #include "tcop/utility.h"
 #include "utils/datum.h"
-#include "access/heapam.h"
-#include "executor/executor.h"
-#include "executor/execdefs.h"
-#include "executor/functions.h"
 
 #undef new
 
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index a8535b5a98f..45196dfdf6c 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -21,11 +21,11 @@
 
 #include "access/heapam.h"
 #include "catalog/pg_aggregate.h"
-#include "parser/parse_type.h"
 #include "executor/executor.h"
 #include "executor/nodeAgg.h"
-#include "utils/syscache.h"
 #include "optimizer/clauses.h"
+#include "parser/parse_type.h"
+#include "utils/syscache.h"
 
 /*
  * AggFuncInfo -
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index d32ef038719..50346cd8735 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.22 1999/07/16 03:12:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.23 1999/07/16 04:58:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,8 +57,8 @@
 
 
 #include "access/heapam.h"
-#include "executor/executor.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/nodeAppend.h"
 #include "parser/parsetree.h"
 
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 39a0d65c792..fa46c603ecc 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.24 1999/07/16 03:12:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.25 1999/07/16 04:58:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index f92acd97b33..0a35cf2cf8c 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.39 1999/07/16 03:12:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.40 1999/07/16 04:58:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,16 +30,16 @@
  */
 #include "postgres.h"
 
-#include "executor/executor.h"
-#include "executor/execdebug.h"
-#include "executor/nodeIndexscan.h"
 
-#include "optimizer/clauses.h"
-#include "parser/parsetree.h"
 
-#include "access/heapam.h"
 #include "access/genam.h"
+#include "access/heapam.h"
+#include "executor/execdebug.h"
+#include "executor/executor.h"
+#include "executor/nodeIndexscan.h"
 #include "nodes/nodeFuncs.h"
+#include "optimizer/clauses.h"
+#include "parser/parsetree.h"
 
 /* ----------------
  *		Misc stuff to move to executor.h soon -cim 6/5/90
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index e99fb9d762d..783dbc7b328 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.24 1999/07/16 03:12:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.25 1999/07/16 04:58:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,11 +21,11 @@
 #include "postgres.h"
 
 
+#include "access/heapam.h"
+#include "catalog/heap.h"
 #include "executor/executor.h"
 #include "executor/nodeMaterial.h"
-#include "catalog/heap.h"
 #include "optimizer/internal.h"
-#include "access/heapam.h"
 
 /* ----------------------------------------------------------------
  *		ExecMaterial
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 4d0c3dae92f..62b53af3c65 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.27 1999/05/25 16:08:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.28 1999/07/16 04:58:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -68,10 +68,10 @@
 
 #include "access/heapam.h"
 #include "catalog/pg_operator.h"
-#include "executor/executor.h"
+#include "executor/execdebug.h"
 #include "executor/execdefs.h"
+#include "executor/executor.h"
 #include "executor/nodeMergejoin.h"
-#include "executor/execdebug.h"
 #include "utils/lsyscache.h"
 #include "utils/psort.h"
 
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index 6ee64a60632..a75e82c0b11 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.12 1999/07/15 22:39:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.13 1999/07/16 04:58:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,8 +19,8 @@
  */
 #include "postgres.h"
 
-#include "executor/executor.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/nodeNestloop.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index a45b7f347c0..c83aa725a70 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.19 1999/07/15 22:39:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.20 1999/07/16 04:58:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,10 +24,10 @@
  */
 #include "postgres.h"
 
-#include "executor/executor.h"
+#include "access/heapam.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/nodeSeqscan.h"
-#include "access/heapam.h"
 #include "parser/parsetree.h"
 
 static Oid InitScanRelation(SeqScan *node, EState *estate,
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index a198b8914a2..311938a7435 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -7,13 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.21 1999/07/15 22:39:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.22 1999/07/16 04:58:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 #include <string.h>
 
+#include "postgres.h"
 #include "executor/executor.h"
 #include "executor/execdebug.h"
 #include "executor/nodeSort.h"
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 6c88bbe85e7..e4e83d654ac 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -14,9 +14,9 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "tcop/pquery.h"
 #include "executor/executor.h"
 #include "executor/nodeSubplan.h"
+#include "tcop/pquery.h"
 
 /* ----------------------------------------------------------------
  *		ExecSubPlan(node)
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index 1fd6644058f..af07ab83c0b 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.22 1999/07/16 03:12:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.23 1999/07/16 04:58:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,10 +26,10 @@
 
 #include "postgres.h"
 
-#include "executor/executor.h"
-#include "executor/nodeUnique.h"
 #include "access/heapam.h"
 #include "access/printtup.h"
+#include "executor/executor.h"
+#include "executor/nodeUnique.h"
 
 /* ----------------------------------------------------------------
  *		ExecIdenticalTuples