aboutsummaryrefslogtreecommitdiff
path: root/src/backend/bootstrap/bootstrap.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-05-08 14:49:04 +0000
committerBruce Momjian <bruce@momjian.us>2003-05-08 14:49:04 +0000
commit5e7a5c9511b65d483639dd3f7dfab7b9e92c3433 (patch)
treef9463be8f9f422ebdd960dda3fc4a1d80477f0bc /src/backend/bootstrap/bootstrap.c
parent4e08d35e7d41b5775c8509973596f01ac2c3f664 (diff)
downloadpostgresql-5e7a5c9511b65d483639dd3f7dfab7b9e92c3433.tar.gz
postgresql-5e7a5c9511b65d483639dd3f7dfab7b9e92c3433.zip
Pass shared memory address on command line to exec'ed backend.
Allow backends to attached to specified shared memory address.
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
-rw-r--r--src/backend/bootstrap/bootstrap.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 215e165cf72..54b541a0d6c 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.155 2003/05/06 23:34:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.156 2003/05/08 14:49:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -286,11 +286,14 @@ BootstrapMain(int argc, char *argv[])
case 'p':
{
/* indicates fork from postmaster */
- char *p;
#ifdef EXEC_BACKEND
- sscanf(optarg, "%d,", &UsedShmemSegID);
+ char *p;
+
+ sscanf(optarg, "%d,%p,", &UsedShmemSegID, &UsedShmemSegAddr);
p = strchr(optarg, ',');
if (p)
+ p = strchr(p+1, ',');
+ if (p)
dbname = strdup(p+1);
#else
dbname = strdup(optarg);