From c2c9fbef941adfae894eac69a7ea9734caf712a0 Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Sun, 4 May 2008 03:46:08 +0000
Subject: [PATCH] Place statement timeout more appropriately, per gripe from
Tom.
---
src/bin/pg_dump/pg_backup_archiver.c | 10 ++++------
1 file 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 $
*
*-------------------------------------------------------------------------
*/
@@ -219,11 +219,6 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
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.
*/
@@ -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));
--
GitLab