diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2010-05-15 07:14:43 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2010-05-15 07:14:43 +0000 |
| commit | 4a24c9a06325fe18a5aa96b116bd85ab58172ac8 (patch) | |
| tree | cb0907ea46309edbee1d22c8c75b6011d2e00b86 /src/backend/access/transam/xlog.c | |
| parent | a724584735db27663163f3c45df77218764e6669 (diff) | |
| download | postgresql-4a24c9a06325fe18a5aa96b116bd85ab58172ac8.tar.gz postgresql-4a24c9a06325fe18a5aa96b116bd85ab58172ac8.zip | |
Fix bug in processing of checkpoint time for max_standby_delay. Latest
log time was incorrectly set, typically leading to dates in the past,
which would cause more cancellations in Hot Standby on a quiet server.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index fc59a716b79..87b7e82a4f8 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.411 2010/05/14 07:11:48 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.412 2010/05/15 07:14:43 sriggs Exp $ * *------------------------------------------------------------------------- */ @@ -5450,7 +5450,7 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis) CheckPoint checkPoint; memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint)); - recoveryLastXTime = checkPoint.time; + recoveryLastXTime = time_t_to_timestamptz(checkPoint.time); } /* |