aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2009-07-29 15:57:11 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2009-07-29 15:57:11 +0000
commit850490579318ff52097eec92ce535357dd0c7a3a (patch)
tree95a850ab23d344cd9dbfa050809da3ac303f3ebc
parent49475aab8d0da9077a5828d404ba1e15c3e093c2 (diff)
downloadpostgresql-850490579318ff52097eec92ce535357dd0c7a3a.tar.gz
postgresql-850490579318ff52097eec92ce535357dd0c7a3a.zip
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.
-rw-r--r--src/backend/storage/ipc/procarray.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index e71b95c8269..9a3d2f62606 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.51 2009/07/29 15:57:11 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)