summaryrefslogtreecommitdiff
path: root/src/backend/utils/init/postinit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/init/postinit.c')
-rw-r--r--src/backend/utils/init/postinit.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 76042390cc0..27bb849a08b 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.27 1998/04/05 21:04:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.28 1998/05/29 17:00:21 momjian Exp $
*
* NOTES
* InitPostgres() is the function called from PostgresMain
@@ -384,8 +384,11 @@ forcesharedmemory:
#endif
- PostgresIpcKey = key;
- AttachSharedMemoryAndSemaphores(key);
+ if (!IsUnderPostmaster) /* postmaster already did this */
+ {
+ PostgresIpcKey = key;
+ AttachSharedMemoryAndSemaphores(key);
+ }
}