postgres.git / summary / log / commit / refs

commit    2a88963536297c4227d5f400a3c44a1f6b98c503
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Wed Jul 29 15:57:16 2009 +0000
First released in: 9.0.0, 8.1.18, 8.2.14, 8.3.8, 8.4.1

    Fix a thinko introduced into CountActiveBackends by a recent patch:
    we should ignore NULL array entries, not non-NULL ones.  This had the
    effect of disabling commit_delay, and could have caused a crash in the
    rare race condition the patch was intended to fix.
    
    Bug report and diagnosis by Jeff Janes, in bug #4952.


 src/backend/storage/ipc/procarray.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index e71b95c8269..36701e61891 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -23,7 +23,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.50 2009/06/11 14:49:02 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.50.2.1 2009/07/29 15:57:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1137,7 +1137,7 @@ CountActiveBackends(void)
 		 * free list and are recycled. Its contents are nonsense in that case,
 		 * but that's acceptable for this function.
 		 */
-		if (proc != NULL)
+		if (proc == NULL)
 			continue;
 
 		if (proc == MyProc)


[parent: 3a261300b449]