diff options
Diffstat (limited to 'src/backend/utils/init')
| -rw-r--r-- | src/backend/utils/init/flatfiles.c | 9 | ||||
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 3 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/backend/utils/init/flatfiles.c b/src/backend/utils/init/flatfiles.c index 4dc27dcdf5a..e58c1102c25 100644 --- a/src/backend/utils/init/flatfiles.c +++ b/src/backend/utils/init/flatfiles.c @@ -22,7 +22,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.5 2005/04/14 01:38:20 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.6 2005/04/14 20:03:26 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,6 @@ #include <unistd.h> #include "access/heapam.h" -#include "catalog/catname.h" #include "catalog/pg_database.h" #include "catalog/pg_group.h" #include "catalog/pg_namespace.h" @@ -724,11 +723,11 @@ AtEOXact_UpdateFlatFiles(bool isCommit) * so get the locks we need before writing anything. */ if (database_file_update_subid != InvalidSubTransactionId) - drel = heap_openr(DatabaseRelationName, ExclusiveLock); + drel = heap_open(DatabaseRelationId, ExclusiveLock); if (group_file_update_subid != InvalidSubTransactionId) - grel = heap_openr(GroupRelationName, ExclusiveLock); + grel = heap_open(GroupRelationId, ExclusiveLock); if (user_file_update_subid != InvalidSubTransactionId) - urel = heap_openr(ShadowRelationName, ExclusiveLock); + urel = heap_open(ShadowRelationId, ExclusiveLock); /* Okay to write the files */ if (database_file_update_subid != InvalidSubTransactionId) diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index b906ee581d9..3f34653cb2e 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.138 2005/03/18 03:48:49 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.139 2005/04/14 20:03:26 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,6 @@ #include <utime.h> #endif -#include "catalog/catname.h" #include "catalog/pg_shadow.h" #include "libpq/libpq-be.h" #include "miscadmin.h" diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 00b541204b4..2030106f970 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.144 2005/03/19 23:27:06 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.145 2005/04/14 20:03:26 tgl Exp $ * * *------------------------------------------------------------------------- @@ -22,7 +22,6 @@ #include "catalog/catalog.h" #include "access/heapam.h" -#include "catalog/catname.h" #include "catalog/namespace.h" #include "catalog/pg_database.h" #include "catalog/pg_shadow.h" @@ -134,7 +133,7 @@ ReverifyMyDatabase(const char *name) * Because we grab RowShareLock here, we can be sure that dropdb() * is not running in parallel with us (any more). */ - pgdbrel = heap_openr(DatabaseRelationName, RowShareLock); + pgdbrel = heap_open(DatabaseRelationId, RowShareLock); ScanKeyInit(&key, Anum_pg_database_datname, @@ -537,7 +536,7 @@ ThereIsAtLeastOneUser(void) HeapScanDesc scan; bool result; - pg_shadow_rel = heap_openr(ShadowRelationName, AccessExclusiveLock); + pg_shadow_rel = heap_open(ShadowRelationId, AccessExclusiveLock); pg_shadow_dsc = RelationGetDescr(pg_shadow_rel); scan = heap_beginscan(pg_shadow_rel, SnapshotNow, 0, NULL); |