diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2008-05-04 03:46:08 +0000 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2008-05-04 03:46:08 +0000 |
| commit | c2c9fbef941adfae894eac69a7ea9734caf712a0 (patch) | |
| tree | caf3121dec69c1ce63181614d32290ed26c60b7d /src | |
| parent | 17a56c0b55c9bd71c42a9d4c59b06e7bb2e77e60 (diff) | |
| download | postgresql-c2c9fbef941adfae894eac69a7ea9734caf712a0.tar.gz postgresql-c2c9fbef941adfae894eac69a7ea9734caf712a0.zip | |
Place statement timeout more appropriately, per gripe from Tom.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 09c96a71ce9..6f508f7bd39 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.155 2008/05/03 23:32:32 adunstan Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.156 2008/05/04 03:46:08 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -220,11 +220,6 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) } /* - * Disable statement_timeout in archive for pg_restore/psql - */ - ahprintf(AH, "SET statement_timeout = 0;\n"); - - /* * Establish important parameter values right away. */ _doSetFixedOutputState(AH); @@ -2140,6 +2135,9 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt, bool include_acls) static void _doSetFixedOutputState(ArchiveHandle *AH) { + /* Disable statement_timeout in archive for pg_restore/psql */ + ahprintf(AH, "SET statement_timeout = 0;\n") + /* Select the correct character set encoding */ ahprintf(AH, "SET client_encoding = '%s';\n", pg_encoding_to_char(AH->public.encoding)); |