Fix from Tom Lane for pg_shadow in pg_upgrade

diff --git a/doc/src/sgml/ref/pg_upgrade.sgml b/doc/src/sgml/ref/pg_upgrade.sgml
index 7ee84fa0d3cbc1898a6857b9b80eaf76e2f3e474..2f1a0c87f797d7b7d7019d7af22b9729ec5e84a3 100644 (file)
--- a/doc/src/sgml/ref/pg_upgrade.sgml
+++ b/doc/src/sgml/ref/pg_upgrade.sgml
@@ -34,7 +34,7 @@ Description
  PostgreSQL release without reloading all the data.  First,
  to be safe, back up your data directory.  Then, use:
 <programlisting>
-% pg_dumpall -s >db.out
+% pg_dumpall -s -z >db.out
 </programlisting>
 to dump out your old  database definitions without any
 data.  Stop the postmaster and all backends.

diff --git a/src/bin/pg_dump/pg_upgrade b/src/bin/pg_dump/pg_upgrade
index 26e905bc2242b8c6ce7f4fbccf13b04ad9088107..2fc631fe361285856b049c0e760ca9acd9112765 100755 (executable)
--- a/src/bin/pg_dump/pg_upgrade
+++ b/src/bin/pg_dump/pg_upgrade
@@ -61,7 +61,7 @@ fi
 # then shouldn't be in there anyway
 
 cat $INPUT | awk '     {
-                               if (toupper($0) ~ /^COPY /)
+                               if (toupper($1) != "COPY" && $2 != "pg_shadow")
                                        while (getline $0 > 0 && $0 != "\\.")
                                                ;
                                else    print $0;

diff --git a/src/man/pg_upgrade.1 b/src/man/pg_upgrade.1
index 75c48d096defb8cb4253e69415a31b3e433040db..4c260b20eb5c5ef710c8513ea501d61afd257a05 100644 (file)
--- a/src/man/pg_upgrade.1
+++ b/src/man/pg_upgrade.1
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/pg_upgrade.1,v 1.4 1998/08/31 04:32:18 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/pg_upgrade.1,v 1.5 1998/10/25 02:47:38 momjian Exp $
 .TH pg_upgrade UNIX 1/20/96 PostgreSQL PostgreSQL
 .SH NAME
 pg_upgrade - allows upgrade from a previous release without reloading data
@@ -15,7 +15,7 @@ First, to be safe, back up your data directory.
 Then, use:
 .nf
 
-       pg_dumpall -s >db.out
+       pg_dumpall -s -z >db.out
 
 .fi
 to dump out your old database definitions without any data.