diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2013-04-30 15:32:10 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2013-04-30 15:32:10 +0100 |
| commit | be475a2473b18a62a02d56c44047e16b54aac54d (patch) | |
| tree | 813becfe93bff7304706e19a9cda0fae2de15a91 | |
| parent | 28377213bb6550cc5035b0ba258b518f80c1aaae (diff) | |
| download | postgresql-be475a2473b18a62a02d56c44047e16b54aac54d.tar.gz postgresql-be475a2473b18a62a02d56c44047e16b54aac54d.zip | |
Revert previous temporary patch
| -rw-r--r-- | contrib/pg_upgrade/controldata.c | 12 |
1 files 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"); + } } |