Small cleanup.

vadim4o · vadim4o · commit 4040fcfa7806 · 1999-10-06T22:44:25.000Z
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.121 1999/10/06 21:58:03 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.122 1999/10/06 22:44:25 vadim Exp $
  *
  * NOTES
  *
@@ -1232,12 +1232,16 @@ pmdie(SIGNAL_ARGS)
 				return;
 			if (DLGetHead(BackendList))			/* let reaper() handle this */
 			{
+				Shutdown = FastShutdown;
 				if (!FatalError)
 					SignalChildren(SIGTERM);
 				return;
 			}
 			if (Shutdown > NoShutdown)
+			{
+				Shutdown = FastShutdown;
 				return;
+			}
 			Shutdown = FastShutdown;
 			/*
 			 * No children left. Shutdown data base system.
@@ -1247,7 +1251,7 @@ pmdie(SIGNAL_ARGS)
 			if (ShutdownPID > 0)
 				abort();
 
-			ShutdownPID = ShutdownDataBase();	/* flag for reaper() */
+			ShutdownPID = ShutdownDataBase();
 			return;
 
 		case SIGQUIT:

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.121 1999/10/06 21:58:03 vadim Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.122 1999/10/06 22:44:25 vadim Exp $`
`14`	`14`	`*`
`15`	`15`	`* NOTES`
`16`	`16`	`*`
`@@ -1232,12 +1232,16 @@ pmdie(SIGNAL_ARGS)`
`1232`	`1232`	`return;`
`1233`	`1233`	`if (DLGetHead(BackendList)) /* let reaper() handle this */`
`1234`	`1234`	`{`
	`1235`	`+ Shutdown = FastShutdown;`
`1235`	`1236`	`if (!FatalError)`
`1236`	`1237`	`SignalChildren(SIGTERM);`
`1237`	`1238`	`return;`
`1238`	`1239`	`}`
`1239`	`1240`	`if (Shutdown > NoShutdown)`
	`1241`	`+ {`
	`1242`	`+ Shutdown = FastShutdown;`
`1240`	`1243`	`return;`
	`1244`	`+ }`
`1241`	`1245`	`Shutdown = FastShutdown;`
`1242`	`1246`	`/*`
`1243`	`1247`	`* No children left. Shutdown data base system.`
`@@ -1247,7 +1251,7 @@ pmdie(SIGNAL_ARGS)`
`1247`	`1251`	`if (ShutdownPID > 0)`
`1248`	`1252`	`abort();`
`1249`	`1253`
`1250`		`- ShutdownPID = ShutdownDataBase(); /* flag for reaper() */`
	`1254`	`+ ShutdownPID = ShutdownDataBase();`
`1251`	`1255`	`return;`
`1252`	`1256`
`1253`	`1257`	`case SIGQUIT:`