From 5e7a5c9511b65d483639dd3f7dfab7b9e92c3433 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 8 May 2003 14:49:04 +0000
Subject: Pass shared memory address on command line to exec'ed backend.

Allow backends to attached to specified shared memory address.
---
 src/backend/tcop/postgres.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/backend/tcop/postgres.c')

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 78696cd0771..89564558708 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.338 2003/05/06 23:34:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.339 2003/05/08 14:49:04 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2025,13 +2025,17 @@ PostgresMain(int argc, char *argv[], const char *username)
 				 */
 				if (secure)
 				{
-					char *p;
 #ifdef EXEC_BACKEND
-					sscanf(optarg, "%d,%d,", &MyProcPort->sock, &UsedShmemSegID);
+					char *p;
+
+					sscanf(optarg, "%d,%d,%p,", &MyProcPort->sock,
+									&UsedShmemSegID, &UsedShmemSegAddr);
 					/* Grab dbname as last param */
 					p = strchr(optarg, ',');
 					if (p)
 						p = strchr(p+1, ',');
+					if (p)					
+						p = strchr(p+1, ',');
 					if (p)					
 						dbname = strdup(p+1);
 #else
@@ -2393,7 +2397,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.338 $ $Date: 2003/05/06 23:34:55 $\n");
+		puts("$Revision: 1.339 $ $Date: 2003/05/08 14:49:04 $\n");
 	}
 
 	/*
-- 
cgit v1.2.3