|
15 | 15 | * |
16 | 16 | * |
17 | 17 | * IDENTIFICATION |
18 | | - *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.180 2010/02/23 21:48:32 momjian Exp $ |
| 18 | + *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.181 2010/02/24 02:42:54 tgl Exp $ |
19 | 19 | * |
20 | 20 | *------------------------------------------------------------------------- |
21 | 21 | */ |
@@ -304,15 +304,14 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) |
304 | 304 |
|
305 | 305 | if (AH->public.verbose) |
306 | 306 | { |
307 | | -ahprintf(AH,"--\n-- pg_dump version: %s\n",PG_VERSION); |
308 | | -ahprintf(AH,"--\n-- remote database version: %s (%d)\n" |
309 | | -,AHX->remoteVersionStr |
310 | | -,AHX->remoteVersion) ; |
311 | | -ahprintf(AH,"--\n\n"); |
312 | | -} |
313 | | - |
314 | | -if (AH->public.verbose) |
| 307 | +if (AH->archiveRemoteVersion) |
| 308 | +ahprintf(AH,"-- Dumped from database version %s\n", |
| 309 | +AH->archiveRemoteVersion); |
| 310 | +if (AH->archiveDumpVersion) |
| 311 | +ahprintf(AH,"-- Dumped by pg_dump version %s\n", |
| 312 | +AH->archiveDumpVersion); |
315 | 313 | dumpTimestamp(AH,"Started on",AH->createDate); |
| 314 | +} |
316 | 315 |
|
317 | 316 | if (ropt->single_txn) |
318 | 317 | { |
@@ -1860,6 +1859,8 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt, |
1860 | 1859 | AH->public.exit_on_error= true; |
1861 | 1860 | AH->public.n_errors=0; |
1862 | 1861 |
|
| 1862 | +AH->archiveDumpVersion=PG_VERSION; |
| 1863 | + |
1863 | 1864 | AH->createDate=time(NULL); |
1864 | 1865 |
|
1865 | 1866 | AH->intSize=sizeof(int); |
@@ -3059,7 +3060,6 @@ ReadHead(ArchiveHandle *AH) |
3059 | 3060 | AH->archiveRemoteVersion=ReadStr(AH); |
3060 | 3061 | AH->archiveDumpVersion=ReadStr(AH); |
3061 | 3062 | } |
3062 | | - |
3063 | 3063 | } |
3064 | 3064 |
|
3065 | 3065 |
|
|