Add stray "else" that seems to have gone missing.

robertmhaas · robertmhaas · commit 243bbe6ed85d · 2010-06-24T16:40:45.000Z
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.612 2010/06/16 00:54:16 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.613 2010/06/24 16:40:45 rhaas Exp $
  *
  * NOTES
  *
@@ -2224,11 +2224,11 @@ pmdie(SIGNAL_ARGS)
 				/* only bgwriter is active in this state */
 				pmState = PM_WAIT_BACKENDS;
 			}
-			if (pmState == PM_RUN ||
-				pmState == PM_WAIT_BACKUP ||
-				pmState == PM_WAIT_READONLY ||
-				pmState == PM_WAIT_BACKENDS ||
-				pmState == PM_HOT_STANDBY)
+			else if (pmState == PM_RUN ||
+					 pmState == PM_WAIT_BACKUP ||
+					 pmState == PM_WAIT_READONLY ||
+					 pmState == PM_WAIT_BACKENDS ||
+					 pmState == PM_HOT_STANDBY)
 			{
 				ereport(LOG,
 						(errmsg("aborting any active transactions")));

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.612 2010/06/16 00:54:16 petere Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.613 2010/06/24 16:40:45 rhaas Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -2224,11 +2224,11 @@ pmdie(SIGNAL_ARGS)`
`2224`	`2224`	`/* only bgwriter is active in this state */`
`2225`	`2225`	`pmState = PM_WAIT_BACKENDS;`
`2226`	`2226`	`}`
`2227`		`- if (pmState == PM_RUN \|\|`
`2228`		`- pmState == PM_WAIT_BACKUP \|\|`
`2229`		`- pmState == PM_WAIT_READONLY \|\|`
`2230`		`- pmState == PM_WAIT_BACKENDS \|\|`
`2231`		`- pmState == PM_HOT_STANDBY)`
	`2227`	`+ else if (pmState == PM_RUN \|\|`
	`2228`	`+ pmState == PM_WAIT_BACKUP \|\|`
	`2229`	`+ pmState == PM_WAIT_READONLY \|\|`
	`2230`	`+ pmState == PM_WAIT_BACKENDS \|\|`
	`2231`	`+ pmState == PM_HOT_STANDBY)`
`2232`	`2232`	`{`
`2233`	`2233`	`ereport(LOG,`
`2234`	`2234`	`(errmsg("aborting any active transactions")));`