diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2010-01-28 07:31:42 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2010-01-28 07:31:42 +0000 |
| commit | e0e8b9634555f876570d3c1596a50419848a1046 (patch) | |
| tree | 55028000a2c0d285e8b06990b92d45a2c5476a15 /src/include/access/xlog.h | |
| parent | e3f36838e5b2666a15286b137bb11f35a7245848 (diff) | |
| download | postgresql-e0e8b9634555f876570d3c1596a50419848a1046.tar.gz postgresql-e0e8b9634555f876570d3c1596a50419848a1046.zip | |
Change a few remaining calls of XLogArchivingActive() to use
XLogIsNeeded() instead, to determine if an otherwise non-logged operation
needs to be logged in WAL for standby servers.
Fujii Masao
Diffstat (limited to 'src/include/access/xlog.h')
| -rw-r--r-- | src/include/access/xlog.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index ca4d7f289a7..d7aeb2fe06b 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.98 2010/01/20 19:43:40 heikki Exp $ + * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.99 2010/01/28 07:31:42 heikki Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -186,7 +186,6 @@ extern int MaxStandbyDelay; #define XLogArchivingActive() (XLogArchiveMode) #define XLogArchiveCommandSet() (XLogArchiveCommand[0] != '\0') -#define XLogStandbyInfoActive() (XLogRequestRecoveryConnections && XLogArchiveMode) /* * This is in walsender.c, but declared here so that we don't need to include @@ -200,6 +199,9 @@ extern int MaxWalSenders; */ #define XLogIsNeeded() (XLogArchivingActive() || (MaxWalSenders > 0)) +/* Do we need to WAL-log information required only for Hot Standby? */ +#define XLogStandbyInfoActive() (XLogRequestRecoveryConnections && XLogIsNeeded()) + #ifdef WAL_DEBUG extern bool XLOG_DEBUG; #endif |