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.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fc59a716b79ca46b651190ffe9b458c85b8f392b..87b7e82a4f800ca490757d29e8b4795a7911e0ae 100644 (file)
--- 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);
                }
 
                /*