diff options
| author | Bruce Momjian | 1998-10-25 02:47:38 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-10-25 02:47:38 +0000 |
| commit | ba74ce73bbb617b821c87bd97753a4944ccb3986 (patch) | |
| tree | 4f1ddf3f63e876d04697555357a5a2047530425d | |
| parent | cf5055261eb3c5513a72215645ff7a9a6f533a7c (diff) | |
Fix from Tom Lane for pg_shadow in pg_upgrade
| -rw-r--r-- | doc/src/sgml/ref/pg_upgrade.sgml | 2 | ||||
| -rwxr-xr-x | src/bin/pg_dump/pg_upgrade | 2 | ||||
| -rw-r--r-- | src/man/pg_upgrade.1 | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/sgml/ref/pg_upgrade.sgml b/doc/src/sgml/ref/pg_upgrade.sgml index 7ee84fa0d3..2f1a0c87f7 100644 --- 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 26e905bc22..2fc631fe36 100755 --- 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 75c48d096d..4c260b20eb 100644 --- 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. |