pg_upgrade: improve instructions for fixing incompatible isn use

This clarifies instructions on how to dump/reload databases that use
incompatible isn versions.

Reported-by: Alvaro Herrera
Discussion: https://postgr.es/m/20191114190652[email protected]

Reviewed-by: Daniel Gustafsson <[email protected]>
Back-through: 13

diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index ff7057db7380fcef968e59154e6fd5bfe1f5efa1..b300acb7a3d34a8ab5695571f5703d77527bd528 100644 (file)
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -887,9 +887,9 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
                pg_fatal("Your installation contains \"contrib/isn\" functions which rely on the\n"
                                 "bigint data type.  Your old and new clusters pass bigint values\n"
                                 "differently so this cluster cannot currently be upgraded.  You can\n"
-                                "manually upgrade databases that use \"contrib/isn\" facilities and remove\n"
-                                "\"contrib/isn\" from the old cluster and restart the upgrade.  A list of\n"
-                                "the problem functions is in the file:\n"
+                                "manually dump databases in the old cluster that use \"contrib/isn\"\n"
+                                "facilities, drop them, perform the upgrade, and then restore them.  A\n"
+                                "list of the problem functions is in the file:\n"
                                 "    %s\n\n", output_path);
        }
        else