git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c

index a02a8ecaa2391ac31a76eb2bc478ea149ff98cb8..0e70b6f80b484e4e4535c025d3e997f76d4bfd4e 100644 (file)

--- a/contrib/pg_upgrade/controldata.c

+++ b/contrib/pg_upgrade/controldata.c

* We might eventually allow upgrades from checksum to no-checksum

* clusters.

*/

- if (oldctrl->data_checksum_version != newctrl->data_checksum_version)

- {

- pg_fatal("old and new pg_controldata checksum versions are invalid or do not match\n");

- }

+ if (oldctrl->data_checksum_version == 0 &&

+ newctrl->data_checksum_version != 0)

+ pg_fatal("old cluster does not use data checksums but the new one does\n");

+ else if (oldctrl->data_checksum_version != 0 &&

+ newctrl->data_checksum_version == 0)

+ pg_fatal("old cluster uses data checksums but the new one does not\n");

+ else if (oldctrl->data_checksum_version != newctrl->data_checksum_version)

+ pg_fatal("old and new cluster pg_controldata checksum versions do not match\n");

}