From ed3ea3fa0c02a88753c5a162a1fe94e67604b627 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Thu, 12 Aug 2010 23:25:45 +0000 Subject: Correct sundry errors in Hot Standby-related comments. Fujii Masao --- src/include/access/xlog.h | 4 ++-- src/include/catalog/pg_control.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/include') diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 47e2268bad8..8106e9524f5 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.114.2.1 2010/08/01 23:07:05 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.114.2.2 2010/08/12 23:25:45 rhaas Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -149,7 +149,7 @@ extern bool InRecovery; * InHotStandby will read as FALSE). * * In DISABLED state, we're performing crash recovery or hot standby was - * disabled in recovery.conf. + * disabled in postgresql.conf. * * In INITIALIZED state, we've run InitRecoveryTransactionEnvironment, but * we haven't yet processed a RUNNING_XACTS or shutdown-checkpoint WAL record diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index f3fdb05d550..03270d36bdd 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.57 2010/06/03 20:37:13 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.57.2.1 2010/08/12 23:25:45 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -45,7 +45,7 @@ typedef struct CheckPoint /* * Oldest XID still running. This is only needed to initialize hot standby * mode from an online checkpoint, so we only bother calculating this for - * online checkpoints and only when archiving is enabled. Otherwise it's + * online checkpoints and only when wal_level is hot_standby. Otherwise it's * set to InvalidTransactionId. */ TransactionId oldestActiveXid; -- cgit v1.2.3