diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.c | 7 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 7a8588cdf6e..09c96a71ce9 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.154 2008/04/13 03:49:21 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.155 2008/05/03 23:32:32 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -220,6 +220,11 @@ 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); diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index dbc3a191b5e..f7ac1706de8 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -12,7 +12,7 @@ * by PostgreSQL * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.488 2008/04/14 17:05:33 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.489 2008/05/03 23:32:32 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -571,6 +571,12 @@ main(int argc, char **argv) do_sql_command(g_conn, "SET synchronize_seqscans TO off"); /* + * Disable timeouts if supported. + */ + if (g_fout->remoteVersion >= 70300) + do_sql_command(g_conn, "SET statement_timeout = 0"); + + /* * Start serializable transaction to dump consistent data. */ do_sql_command(g_conn, "BEGIN"); |