aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/optimizer/path/Makefile7
-rw-r--r--src/backend/optimizer/path/_deadcode/predmig.c (renamed from src/backend/optimizer/path/predmig.c)2
-rw-r--r--src/backend/optimizer/path/joinpath.c4
-rw-r--r--src/backend/optimizer/path/pathkey.c (renamed from src/backend/optimizer/path/joinutils.c)2
4 files changed, 6 insertions, 9 deletions
diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile
index 88525cdfeac..7bf1b6f3313 100644
--- a/src/backend/optimizer/path/Makefile
+++ b/src/backend/optimizer/path/Makefile
@@ -4,7 +4,7 @@
# Makefile for optimizer/path
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.6 1998/04/06 00:23:17 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.7 1999/02/18 19:58:51 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -14,10 +14,7 @@ include ../../../Makefile.global
CFLAGS += -I../..
OBJS = allpaths.o clausesel.o costsize.o hashutils.o indxpath.o \
- joinpath.o joinrels.o joinutils.o mergeutils.o orindxpath.o \
- prune.o
-
-# not ready yet: predmig.o xfunc.o
+ joinpath.o joinrels.o mergeutils.o orindxpath.o pathkey.o prune.o
all: SUBSYS.o
diff --git a/src/backend/optimizer/path/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c
index e4761f620f7..058b89780d6 100644
--- a/src/backend/optimizer/path/predmig.c
+++ b/src/backend/optimizer/path/_deadcode/predmig.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.18 1999/02/13 23:16:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.1 1999/02/18 19:58:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 8a62c44b855..4846dfba50f 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.28 1999/02/18 00:49:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.29 1999/02/18 19:58:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -203,7 +203,7 @@ sort_inner_and_outer(RelOptInfo *joinrel,
List *mergeinfo_list)
{
List *ms_list = NIL;
- MergeInfo *xmergeinfo = (MergeInfo *) NULL;
+ MergeInfo *xmergeinfo = (MergeInfo *) NULL;
MergePath *temp_node = (MergePath *) NULL;
List *i;
List *outerkeys = NIL;
diff --git a/src/backend/optimizer/path/joinutils.c b/src/backend/optimizer/path/pathkey.c
index 4f4fb7051be..50196f03795 100644
--- a/src/backend/optimizer/path/joinutils.c
+++ b/src/backend/optimizer/path/pathkey.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.22 1999/02/15 05:56:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/pathkey.c,v 1.1 1999/02/18 19:58:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/