aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim B. Mikheev <vadim4o@yahoo.com>1999-10-06 22:44:25 +0000
committerVadim B. Mikheev <vadim4o@yahoo.com>1999-10-06 22:44:25 +0000
commit4040fcfa78065882aa16895906ff8398aaaf1c23 (patch)
tree3acb42d5be091231b2dd146aaf2fa91278722e47
parent47937403676d913c0e740eec6b85113865c6c8ab (diff)
downloadpostgresql-4040fcfa78065882aa16895906ff8398aaaf1c23.tar.gz
postgresql-4040fcfa78065882aa16895906ff8398aaaf1c23.zip
Small cleanup.
-rw-r--r--src/backend/postmaster/postmaster.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index bb6d5b638eb..7e984f1027a 100644
--- 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: