2 files changed, 6 insertions, 17 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 70d835aa25..c3c3ad946e 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.85 2001/05/08 21:06:43 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.86 2001/05/30 20:52:32 momjian Exp $
  *
  *
  *-------------------------------------------------------------------------
@@ -21,10 +21,7 @@
 #include <math.h>
 #include <unistd.h>
 
-#ifndef OLD_FILE_NAMING
 #include "catalog/catalog.h"
-#endif
-
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index 73034d2e78..be56a6902f 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.46 2001/05/30 14:15:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.47 2001/05/30 20:52:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -140,19 +140,11 @@ GetRawDatabaseInfo(const char *name, Oid *db_id, char *path)
 	Page		pg;
 	char	   *dbfname;
 	Form_pg_database tup_db;
+	RelFileNode rnode;
 
-#ifdef OLD_FILE_NAMING
-	dbfname = (char *) palloc(strlen(DataDir) + 8 + strlen(DatabaseRelationName) + 2);
-	sprintf(dbfname, "%s/global/%s", DataDir, DatabaseRelationName);
-#else
-	{
-		RelFileNode rnode;
-
-		rnode.tblNode = 0;
-		rnode.relNode = RelOid_pg_database;
-		dbfname = relpath(rnode);
-	}
-#endif
+	rnode.tblNode = 0;
+	rnode.relNode = RelOid_pg_database;
+	dbfname = relpath(rnode);
 
 	if ((dbfd = open(dbfname, O_RDONLY | PG_BINARY, 0)) < 0)
 		elog(FATAL, "cannot open %s: %m", dbfname);