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
commit957a78222071732f53d45f64ab6d655a27e65f65 (patch)
tree895968aa5aedbde173b1386ed3adf6b20bc7678d /src/bin/pg_upgrade/relfilenode.c
parentf09e2a8c6307058aa767924516bb057cc9cedef8 (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 06d3ed04a78..dd1e50e9489 100644
--- a/src/bin/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -160,16 +160,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);
}
}
}