Small correction to previous patch: we shouldn't ReleasePostmasterChildSlot

tglsfdc · tglsfdc · commit 5a4f7638419b · 2009-08-24T18:09:37.000Z
for a dead_end child, because we didn't AssignPostmasterChildSlot.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.588 2009/08/24 17:23:02 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.589 2009/08/24 18:09:37 tgl Exp $
  *
  * NOTES
  *
@@ -3024,7 +3024,8 @@ BackendStartup(Port *port)
 		/* in parent, fork failed */
 		int			save_errno = errno;
 
-		(void) ReleasePostmasterChildSlot(bn->child_slot);
+		if (!bn->dead_end)
+			(void) ReleasePostmasterChildSlot(bn->child_slot);
 		free(bn);
 		errno = save_errno;
 		ereport(LOG,

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.588 2009/08/24 17:23:02 alvherre Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.589 2009/08/24 18:09:37 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -3024,7 +3024,8 @@ BackendStartup(Port *port)`
`3024`	`3024`	`/* in parent, fork failed */`
`3025`	`3025`	`int save_errno = errno;`
`3026`	`3026`
`3027`		`- (void) ReleasePostmasterChildSlot(bn->child_slot);`
	`3027`	`+ if (!bn->dead_end)`
	`3028`	`+ (void) ReleasePostmasterChildSlot(bn->child_slot);`
`3028`	`3029`	`free(bn);`
`3029`	`3030`	`errno = save_errno;`
`3030`	`3031`	`ereport(LOG,`