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

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2837721)
Revert previous temporary patch
2013年4月30日 14:32:10 +0000 (15:32 +0100)
2013年4月30日 14:32:10 +0000 (15:32 +0100)

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");
+ }
}
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /