summaryrefslogtreecommitdiff
path: root/src/backend/catalog
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-07-03 20:48:46 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-07-03 20:48:46 +0000
commitef5bea51e17d36ab06e7e67847a8b1e489d6d189 (patch)
treef4efcdceb9b0392d7e416211291505f9dcaa3004 /src/backend/catalog
parente2d3932e0eaaac60928dacfc7902ac788b25b100 (diff)
downloadpostgresql-ef5bea51e17d36ab06e7e67847a8b1e489d6d189.tar.gz
Move global internal files to PGDATA/global.
Diffstat (limited to 'src/backend/catalog')
-rw-r--r--src/backend/catalog/catalog.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 4a5b1d9df2..dd9c774e2c 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.32 2000/04/12 17:14:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.33 2000/07/03 20:48:28 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,11 +37,11 @@ relpath(const char *relname)
if (IsSharedSystemRelationName(relname))
{
- /* Shared system relations live in DataDir */
- size_t bufsize = strlen(DataDir) + sizeof(NameData) + 2;
+ /* Shared system relations live in {datadir}/global */
+ size_t bufsize = strlen(DataDir) + 8 + sizeof(NameData) + 1;
path = (char *) palloc(bufsize);
- snprintf(path, bufsize, "%s%c%s", DataDir, SEP_CHAR, relname);
+ snprintf(path, bufsize, "%s/global/%s", DataDir, relname);
return path;
}
@@ -71,9 +71,9 @@ relpath_blind(const char *dbname, const char *relname,
if (dbid == (Oid) 0)
{
- /* Shared system relations live in DataDir */
- path = (char *) palloc(strlen(DataDir) + sizeof(NameData) + 2);
- sprintf(path, "%s%c%s", DataDir, SEP_CHAR, relname);
+ /* Shared system relations live in {datadir}/global */
+ path = (char *) palloc(strlen(DataDir) + 8 + sizeof(NameData) + 1);
+ sprintf(path, "%s/global/%s", DataDir, relname);
}
else if (dbid == MyDatabaseId)
{