Revert previous temporary patch

diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index 3c9d115b7e37ba6b73077a09a58bda8edb80b910..e9376e207f434330aeb80e59634f7bf64a81dc7e 100644 (file)
--- 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");
+   }
 }