diff options
| author | Vadim B. Mikheev <vadim4o@yahoo.com> | 2000-10-16 14:52:28 +0000 |
|---|---|---|
| committer | Vadim B. Mikheev <vadim4o@yahoo.com> | 2000-10-16 14:52:28 +0000 |
| commit | 2c7de17b075baf7be270acf4d541bd4b17047e4c (patch) | |
| tree | c9b7aff45678be41380551d87b6168f317064934 /src/backend/postmaster/postmaster.c | |
| parent | 07a55ebf646eb244f52afc11fcca189b0d006970 (diff) | |
New file naming. Database OID is used as "tablespace" id and
relation OID is used as file node on creation but may be changed later
if required. Regression Tests Approved (c) -:)))
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 2f4c2a19fc3..6f9a16af355 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.171 2000/10/11 17:58:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.172 2000/10/16 14:52:08 vadim Exp $ * * NOTES * @@ -60,6 +60,7 @@ #include "getopt.h" #endif +#include "catalog/pg_database.h" #include "commands/async.h" #include "lib/dllist.h" #include "libpq/auth.h" @@ -278,8 +279,14 @@ checkDataDir(const char *DataDir) exit(2); } +#ifdef OLD_FILE_NAMING snprintf(path, sizeof(path), "%s%cbase%ctemplate1%cpg_class", DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR); +#else + snprintf(path, sizeof(path), "%s%cbase%c%u%c%u", + DataDir, SEP_CHAR, SEP_CHAR, + TemplateDbOid, SEP_CHAR, RelOid_pg_class); +#endif fp = AllocateFile(path, PG_BINARY_R); if (fp == NULL) |