aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2019-07-30 21:14:14 +0300
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2019-07-30 21:14:41 +0300
commita6380f8a4b424cf097a066b45b91fa43d367c562 (patch)
tree8819d2c4a9da8ef11a07c274ea200f3e704c769d /src
parent4dbf70b2ff1ee487923394fd9e4fb28bb78839f2 (diff)
downloadpostgresql-a6380f8a4b424cf097a066b45b91fa43d367c562.tar.gz
postgresql-a6380f8a4b424cf097a066b45b91fa43d367c562.zip
Print WAL position correctly in pg_rewind error message.
This has been wrong ever since pg_rewind was added. The if-branch just above this, where we print the same error with an extra message supplied by XLogReadRecord() got this right, but the variable name was wrong in the else-branch. As a consequence, the error printed the WAL position as 0/0 if there was an error reading a WAL file. Backpatch to 9.5, where pg_rewind was added.
Diffstat (limited to 'src')
-rw-r--r--src/bin/pg_rewind/parsexlog.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index 1689279767f..8641dce306f 100644
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -90,8 +90,7 @@ extractPageMap(const char *datadir, XLogRecPtr startpoint, int tliIndex,
errormsg);
else
pg_fatal("could not read WAL record at %X/%X\n",
- (uint32) (startpoint >> 32),
- (uint32) (startpoint));
+ (uint32) (errptr >> 32), (uint32) (errptr));
}
extractPageInfo(xlogreader);