diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2019-07-30 21:14:14 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2019-07-30 21:14:14 +0300 |
| commit | d8b094dabb0fa16388340ca823d0a38285d2d6ce (patch) | |
| tree | b2fd0b53dfb6be78a840460655301cd1628aa47b | |
| parent | 14ef15a22246ca17c949e7a9d1abe14c8874d743 (diff) | |
| download | postgresql-d8b094dabb0fa16388340ca823d0a38285d2d6ce.tar.gz postgresql-d8b094dabb0fa16388340ca823d0a38285d2d6ce.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.
| -rw-r--r-- | src/bin/pg_rewind/parsexlog.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c index 287af60c4e7..f0439edce38 100644 --- a/src/bin/pg_rewind/parsexlog.c +++ b/src/bin/pg_rewind/parsexlog.c @@ -89,8 +89,7 @@ extractPageMap(const char *datadir, XLogRecPtr startpoint, int tliIndex, errormsg); else pg_fatal("could not read WAL record at %X/%X", - (uint32) (startpoint >> 32), - (uint32) (startpoint)); + (uint32) (errptr >> 32), (uint32) (errptr)); } extractPageInfo(xlogreader); |