summaryrefslogtreecommitdiff
path: root/src/bin/pg_upgrade/relfilenode.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2020-10-06 14:31:21 -0400
committerBruce Momjian <bruce@momjian.us>2020-10-06 14:31:21 -0400
commit77971bc4f2371ce25b87b105470a39d5f21815d1 (patch)
treed8b3544605d434e45b923105409b710a7d3e3559 /src/bin/pg_upgrade/relfilenode.c
parentdc3953421b436981260ff3dc658e9a6c4c3f6ebe (diff)
pg_upgrade: remove pre-8.4 code and >= 8.4 check
We only support upgrading from >= 8.4 so no need for this code or tests. Reported-by: Magnus Hagander Discussion: https://postgr.es/m/CABUevEx-D0PNVe00tkeQRGennZQwDtBJn=493MJt-x6sppbUxA@mail.gmail.com Backpatch-through: 9.5
Diffstat (limited to 'src/bin/pg_upgrade/relfilenode.c')
-rw-r--r--src/bin/pg_upgrade/relfilenode.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
index 0c78073f0eb..0f9c5ca34a5 100644
--- a/src/bin/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -168,16 +168,12 @@ transfer_single_new_db(FileNameMap *maps, int size, char *old_tablespace)
/* transfer primary file */
transfer_relfile(&maps[mapnum], "", vm_must_add_frozenbit);
- /* fsm/vm files added in PG 8.4 */
- if (GET_MAJOR_VERSION(old_cluster.major_version) >= 804)
- {
- /*
- * Copy/link any fsm and vm files, if they exist
- */
- transfer_relfile(&maps[mapnum], "_fsm", vm_must_add_frozenbit);
- if (vm_crashsafe_match)
- transfer_relfile(&maps[mapnum], "_vm", vm_must_add_frozenbit);
- }
+ /*
+ * Copy/link any fsm and vm files, if they exist
+ */
+ transfer_relfile(&maps[mapnum], "_fsm", vm_must_add_frozenbit);
+ if (vm_crashsafe_match)
+ transfer_relfile(&maps[mapnum], "_vm", vm_must_add_frozenbit);
}
}
}