Update flow chart.

3 files changed, 7 insertions, 11 deletions

diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index ff68a7fde49..3f7b5281cf7 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.17 1998/07/18 04:22:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.18 1998/08/04 00:42:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -105,7 +105,6 @@ static void
 find_rel_paths(Query *root, List *rels)
 {
 	List	   *temp;
-	RelOptInfo		   *rel;
 	List	   *lastpath;
 
 	foreach(temp, rels)
@@ -113,8 +112,8 @@ find_rel_paths(Query *root, List *rels)
 		List	   *sequential_scan_list;
 		List	   *rel_index_scan_list;
 		List	   *or_index_scan_list;
+		RelOptInfo *rel = (RelOptInfo *) lfirst(temp);
 
-		rel = (RelOptInfo *) lfirst(temp);
 		sequential_scan_list = lcons(create_seqscan_path(rel),
 									 NIL);
 
@@ -125,8 +124,7 @@ find_rel_paths(Query *root, List *rels)
 							 rel->clauseinfo,
 							 rel->joininfo);
 
-		or_index_scan_list =
-			create_or_index_paths(root, rel, rel->clauseinfo);
+		or_index_scan_list = create_or_index_paths(root, rel, rel->clauseinfo);
 
 		rel->pathlist = add_pathlist(rel,
 									 sequential_scan_list,
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 191b1966b8a..4f888ffb55a 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.23 1998/08/03 05:49:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.24 1998/08/04 00:42:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1291,8 +1291,7 @@ create_index_paths(Query *root,
 		if (!join || temp)
 		{						/* restriction, ordering scan */
 			temp_path = create_index_path(root, rel, index, clausegroup, join);
-			temp_node =
-				lcons(temp_path, NIL);
+			temp_node = lcons(temp_path, NIL);
 			ip_list = nconc(ip_list, temp_node);
 		}
 	}
diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c
index 938fb13864d..7523fbd7063 100644
--- a/src/backend/optimizer/path/mergeutils.c
+++ b/src/backend/optimizer/path/mergeutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.5 1998/02/26 04:32:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.6 1998/08/04 00:42:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,8 +61,7 @@ group_clauses_by_order(List *clauseinfo_list,
 
 			p_ordering.ordtype = MERGE_ORDER;
 			p_ordering.ord.merge = merge_ordering;
-			xmergeinfo =
-				match_order_mergeinfo(&p_ordering, mergeinfo_list);
+			xmergeinfo = match_order_mergeinfo(&p_ordering, mergeinfo_list);
 			if (inner_relid == leftop->varno)
 			{
 				keys = makeNode(JoinKey);