Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ba74ce7

Browse files
committed
Fix from Tom Lane for pg_shadow in pg_upgrade
1 parent cf50552 commit ba74ce7

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

doc/src/sgml/ref/pg_upgrade.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Description
3434
PostgreSQL release without reloading all the data. First,
3535
to be safe, back up your data directory. Then, use:
3636
<programlisting>
37-
% pg_dumpall -s >db.out
37+
% pg_dumpall -s -z >db.out
3838
</programlisting>
3939
to dump out your old database definitions without any
4040
data. Stop the postmaster and all backends.

src/bin/pg_dump/pg_upgrade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fi
6161
# then shouldn't be in there anyway
6262

6363
cat $INPUT | awk ' {
64-
if (toupper($0) ~ /^COPY /)
64+
if (toupper($1) != "COPY" && $2 != "pg_shadow")
6565
while (getline $0 > 0 && $0 != "\\.")
6666
;
6767
else print $0;

src/man/pg_upgrade.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" This is -*-nroff-*-
22
.\" XXX standard disclaimer belongs here....
3-
.\" $Header: /cvsroot/pgsql/src/man/Attic/pg_upgrade.1,v 1.4 1998/08/31 04:32:18 momjian Exp $
3+
.\" $Header: /cvsroot/pgsql/src/man/Attic/pg_upgrade.1,v 1.5 1998/10/25 02:47:38 momjian Exp $
44
.TH pg_upgrade UNIX 1/20/96 PostgreSQL PostgreSQL
55
.SH NAME
66
pg_upgrade - allows upgrade from a previous release without reloading data
@@ -15,7 +15,7 @@ First, to be safe, back up your data directory.
1515
Then, use:
1616
.nf
1717

18-
pg_dumpall -s >db.out
18+
pg_dumpall -s -z >db.out
1919

2020
.fi
2121
to dump out your old database definitions without any data.

0 commit comments

Comments
 (0)