git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c

index eba940cf428eee5f33355e3bcad20853ee8974b8..0764c32b9b2f6fd6715262697c85e5fb3e223eba 100644 (file)

--- a/src/backend/postmaster/postmaster.c

+++ b/src/backend/postmaster/postmaster.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.612 2010年06月16日 00:54:16 petere Exp $

+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.613 2010年06月24日 16:40:45 rhaas Exp $

*

* NOTES

*

/* only bgwriter is active in this state */

pmState = PM_WAIT_BACKENDS;

}

- if (pmState == PM_RUN ||

- pmState == PM_WAIT_BACKUP ||

- pmState == PM_WAIT_READONLY ||

- pmState == PM_WAIT_BACKENDS ||

- pmState == PM_HOT_STANDBY)

+ else if (pmState == PM_RUN ||

+ pmState == PM_WAIT_BACKUP ||

+ pmState == PM_WAIT_READONLY ||

+ pmState == PM_WAIT_BACKENDS ||

+ pmState == PM_HOT_STANDBY)

{

ereport(LOG,

(errmsg("aborting any active transactions")));