Improve pg_upgrade error report

If the cluster alignments don't match, output this suggestion:

	Likely one cluster is a 32-bit install, the other 64-bit

diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index 58572d00433d049315e648d0d2edf5ba706c4114..9218f65abc36bfc176af5f5b0da120d1ee912009 100644 (file)
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -502,7 +502,8 @@ check_control_data(ControlData *oldctrl,
 {
        if (oldctrl->align == 0 || oldctrl->align != newctrl->align)
                pg_log(PG_FATAL,
-                          "old and new pg_controldata alignments are invalid or do not match\n");
+                          "old and new pg_controldata alignments are invalid or do not match\n"
+                          "Likely one cluster is a 32-bit install, the other 64-bit\n");
 
        if (oldctrl->blocksz == 0 || oldctrl->blocksz != newctrl->blocksz)
                pg_log(PG_FATAL,