From be475a2473b18a62a02d56c44047e16b54aac54d Mon Sep 17 00:00:00 2001
From: Simon Riggs <simon@2ndQuadrant.com>
Date: Tue, 30 Apr 2013 15:32:10 +0100
Subject: [PATCH] Revert previous temporary patch
---
contrib/pg_upgrade/controldata.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index 3c9d115b7e3..e9376e207f4 100644
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -621,12 +621,12 @@ check_control_data(ControlData *oldctrl,
"options.\n");
}
-// /* We might eventually allow upgrades from checksum to no-checksum clusters. */
-// if (oldctrl->data_checksums != newctrl->data_checksums)
-// {
-// pg_log(PG_FATAL,
-// "old and new pg_controldata checksums settings are invalid or do not match\n");
-// }
+ /* We might eventually allow upgrades from checksum to no-checksum clusters. */
+ if (oldctrl->data_checksums != newctrl->data_checksums)
+ {
+ pg_log(PG_FATAL,
+ "old and new pg_controldata checksums settings are invalid or do not match\n");
+ }
}
--
GitLab