diff options
| author | Robert Haas <rhaas@postgresql.org> | 2010-04-20 11:15:06 +0000 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2010-04-20 11:15:06 +0000 |
| commit | 481cb5d9b506069a6fbe2a7069b576e8eb2f2cde (patch) | |
| tree | 13d7bf638613462df52f11a0b26b8faef28547fc /src/backend/access/transam/xlog.c | |
| parent | c670410e7fe59dffb0227ed1dd0f532013993859 (diff) | |
| download | postgresql-481cb5d9b506069a6fbe2a7069b576e8eb2f2cde.tar.gz postgresql-481cb5d9b506069a6fbe2a7069b576e8eb2f2cde.zip | |
Rename standby_keep_segments to wal_keep_segments.
Also, make the name of the GUC and the name of the backing variable match.
Alnong the way, clean up a couple of slight typographical errors in the
related docs.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 9a60cb9cbac..f887dc28788 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.400 2010/04/18 18:44:53 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.401 2010/04/20 11:15:06 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -66,7 +66,7 @@ /* User-settable parameters */ int CheckPointSegments = 3; -int StandbySegments = 0; +int wal_keep_segments = 0; int XLOGbuffers = 8; int XLogArchiveTimeout = 0; bool XLogArchiveMode = false; @@ -7285,10 +7285,10 @@ CreateCheckPoint(int flags) { /* * Calculate the last segment that we need to retain because of - * standby_keep_segments, by subtracting StandbySegments from the + * wal_keep_segments, by subtracting wal_keep_segments from the * new checkpoint location. */ - if (StandbySegments > 0) + if (wal_keep_segments > 0) { uint32 log; uint32 seg; @@ -7297,8 +7297,8 @@ CreateCheckPoint(int flags) XLByteToSeg(recptr, log, seg); - d_seg = StandbySegments % XLogSegsPerFile; - d_log = StandbySegments / XLogSegsPerFile; + d_seg = wal_keep_segments % XLogSegsPerFile; + d_log = wal_keep_segments / XLogSegsPerFile; if (seg < d_seg) { d_log += 1; |