postgres.git / summary / log / commit / refs

commit    e1f0b9bf94a65bef4ca778f3ea0de4deab6cbcc8
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Fri Aug 07 05:59:42 2009 +0000
First released in: 9.0.0, 8.3.8, 8.4.1

    Fast shutdown stop should forcibly disconnect any active backends, even
    if a smart shutdown is already in progress. Backpatch to 8.3, this was broken
    in the patch that introduced "dead-end backends".
    
    Per report by Itagaki Takahiro, patch by Fujii Masao.


 src/backend/postmaster/postmaster.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 41bb8e4ab0a..49a1502f8da 100644
--- 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.583.2.1 2009/07/08 18:55:42 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.583.2.2 2009/08/07 05:59:42 heikki Exp $
  *
  * NOTES
  *
@@ -2094,6 +2094,7 @@ pmdie(SIGNAL_ARGS)
 			}
 			if (pmState == PM_RUN ||
 				pmState == PM_WAIT_BACKUP ||
+				pmState == PM_WAIT_BACKENDS ||
 				pmState == PM_RECOVERY_CONSISTENT)
 			{
 				ereport(LOG,


[parent: 53890f807389]