Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitbb698c2

Browse files
committed
Fix pg_restore to handle the 'set max oid' entry correctly in archives
dumped by pg_dump -o. Per bug report posted by Bruce; fix is fromPhilip Warner, reviewed by Tom Lane.
1 parent3dfe802 commitbb698c2

File tree

2 files changed

+207
-162
lines changed

2 files changed

+207
-162
lines changed

‎src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*
1717
* IDENTIFICATION
18-
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.38 2001/11/08 04:05:12 tgl Exp $
18+
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.39 2002/01/18 17:13:50 tgl Exp $
1919
*
2020
* Modifications - 28-Jun-2000 - pjw@rhyme.com.au
2121
*
@@ -62,6 +62,11 @@
6262
*backup file; prior version was restoring schema in data-only
6363
*restores. Added enum to make code easier to understand.
6464
*
65+
* Modifications - 18-Jan-2002 - pjw@rhyme.com.au
66+
* - Modified _tocEntryRequired to handle '<Init>/Max OID' as a special
67+
* case (ie. as a DATA item) as per bugs reported by Bruce Momjian
68+
*around 17-Jan-2002.
69+
*
6570
*-------------------------------------------------------------------------
6671
*/
6772

@@ -1917,6 +1922,13 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt)
19171922
res=res& ~REQ_DATA;
19181923
}
19191924

1925+
/* Special case: <Init> type with <Max OID> name; this is part of
1926+
* a DATA restore even though it has SQL.
1927+
*/
1928+
if ( (strcmp(te->desc,"<Init>")==0 )&& (strcmp(te->name,"Max OID")==0) ) {
1929+
res=REQ_DATA;
1930+
}
1931+
19201932
/* Mask it if we only want schema */
19211933
if (ropt->schemaOnly)
19221934
res=res&REQ_SCHEMA;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp