Small cleanup.

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index bb6d5b638eb1c8bef11913da27bf6b6edd137579..7e984f1027a1f4740a117b910b622d3bcf7a39c7 100644 (file)
--- 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: