Commit 17a56c0b authored by Andrew Dunstan's avatar Andrew Dunstan

Disable statement timeouts while making or restoring dumps.

Joshua Drake.
parent c88850f4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * 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 $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -219,6 +219,11 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) ...@@ -219,6 +219,11 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
ahprintf(AH, "BEGIN;\n\n"); ahprintf(AH, "BEGIN;\n\n");
} }
/*
* Disable statement_timeout in archive for pg_restore/psql
*/
ahprintf(AH, "SET statement_timeout = 0;\n");
/* /*
* Establish important parameter values right away. * Establish important parameter values right away.
*/ */
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* by PostgreSQL * by PostgreSQL
* *
* IDENTIFICATION * 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 $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -570,6 +570,12 @@ main(int argc, char **argv) ...@@ -570,6 +570,12 @@ main(int argc, char **argv)
if (g_fout->remoteVersion >= 80300) if (g_fout->remoteVersion >= 80300)
do_sql_command(g_conn, "SET synchronize_seqscans TO off"); 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. * Start serializable transaction to dump consistent data.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment