diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/catalog.c | 6 | ||||
| -rw-r--r-- | src/backend/commands/tablespace.c | 10 | ||||
| -rw-r--r-- | src/bin/initdb/initdb.c | 4 | ||||
| -rw-r--r-- | src/include/catalog/catversion.h | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c index 32d4d33d89a..9ca8b135b4c 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.52 2004/06/18 06:13:19 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.53 2004/06/21 01:04:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,7 @@ relpath(RelFileNode rnode) /* All other tablespaces are accessed via symlinks */ pathlen = strlen(DataDir) + 16 + OIDCHARS + 1 + OIDCHARS + 1 + OIDCHARS + 1; path = (char *) palloc(pathlen); - snprintf(path, pathlen, "%s/pg_tablespaces/%u/%u/%u", + snprintf(path, pathlen, "%s/pg_tblspc/%u/%u/%u", DataDir, rnode.spcNode, rnode.dbNode, rnode.relNode); } return path; @@ -101,7 +101,7 @@ GetDatabasePath(Oid dbNode, Oid spcNode) /* All other tablespaces are accessed via symlinks */ pathlen = strlen(DataDir) + 16 + OIDCHARS + 1 + OIDCHARS + 1; path = (char *) palloc(pathlen); - snprintf(path, pathlen, "%s/pg_tablespaces/%u/%u", + snprintf(path, pathlen, "%s/pg_tblspc/%u/%u", DataDir, spcNode, dbNode); } return path; diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index d412389bb86..d00c01ce17a 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -14,10 +14,10 @@ * files within a tablespace into database-specific subdirectories. * * To support file access via the information given in RelFileNode, we - * maintain a symbolic-link map in $PGDATA/pg_tablespaces. The symlinks are + * maintain a symbolic-link map in $PGDATA/pg_tblspc. The symlinks are * named by tablespace OIDs and point to the actual tablespace directories. * Thus the full path to an arbitrary file is - * $PGDATA/pg_tablespaces/spcoid/dboid/relfilenode + * $PGDATA/pg_tblspc/spcoid/dboid/relfilenode * * There are two tablespaces created at initdb time: global (for shared * tables) and default (for everything else). For backwards compatibility @@ -45,7 +45,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.1 2004/06/18 06:13:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.2 2004/06/21 01:04:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -305,7 +305,7 @@ CreateTableSpace(CreateTableSpaceStmt *stmt) * All seems well, create the symlink */ linkloc = (char *) palloc(strlen(DataDir) + 16 + 10 + 1); - sprintf(linkloc, "%s/pg_tablespaces/%u", DataDir, tablespaceoid); + sprintf(linkloc, "%s/pg_tblspc/%u", DataDir, tablespaceoid); if (symlink(location, linkloc) < 0) ereport(ERROR, @@ -385,7 +385,7 @@ DropTableSpace(DropTableSpaceStmt *stmt) tablespacename); location = (char *) palloc(strlen(DataDir) + 16 + 10 + 1); - sprintf(location, "%s/pg_tablespaces/%u", DataDir, tablespaceoid); + sprintf(location, "%s/pg_tblspc/%u", DataDir, tablespaceoid); /* * Check if the tablespace still contains any files. We try to rmdir diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 44f092fbcc1..ab49c02bb2a 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -39,7 +39,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * Portions taken from FreeBSD. * - * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.38 2004/06/18 06:13:58 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.39 2004/06/21 01:04:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1785,7 +1785,7 @@ main(int argc, char *argv[]) char *pgdenv; /* PGDATA value got from sent to * environment */ char *subdirs[] = - {"global", "pg_xlog", "pg_clog", "base", "base/1", "pg_tablespaces"}; + {"global", "pg_xlog", "pg_clog", "base", "base/1", "pg_tblspc"}; progname = get_progname(argv[0]); set_pglocale_pgservice(argv[0], "initdb"); diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 3ba63bbdea3..fc4ed22ba4a 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.237 2004/06/18 06:14:05 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.238 2004/06/21 01:04:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200406171 +#define CATALOG_VERSION_NO 200406201 #endif |