|
15 | 15 | *
|
16 | 16 | *
|
17 | 17 | * IDENTIFICATION
|
18 |
| - *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.155 2008/05/03 23:32:32 adunstan Exp $ |
| 18 | + *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.156 2008/05/04 03:46:08 adunstan Exp $ |
19 | 19 | *
|
20 | 20 | *-------------------------------------------------------------------------
|
21 | 21 | */
|
@@ -219,11 +219,6 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
|
219 | 219 | ahprintf(AH,"BEGIN;\n\n");
|
220 | 220 | }
|
221 | 221 |
|
222 |
| -/* |
223 |
| - * Disable statement_timeout in archive for pg_restore/psql |
224 |
| - */ |
225 |
| -ahprintf(AH,"SET statement_timeout = 0;\n"); |
226 |
| - |
227 | 222 | /*
|
228 | 223 | * Establish important parameter values right away.
|
229 | 224 | */
|
@@ -2140,6 +2135,9 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt, bool include_acls)
|
2140 | 2135 | staticvoid
|
2141 | 2136 | _doSetFixedOutputState(ArchiveHandle*AH)
|
2142 | 2137 | {
|
| 2138 | +/* Disable statement_timeout in archive for pg_restore/psql */ |
| 2139 | +ahprintf(AH,"SET statement_timeout = 0;\n") |
| 2140 | + |
2143 | 2141 | /* Select the correct character set encoding */
|
2144 | 2142 | ahprintf(AH,"SET client_encoding = '%s';\n",
|
2145 | 2143 | pg_encoding_to_char(AH->public.encoding));
|
|