From f938c2b91bebb7f436a3615cf86347d7261f71e8 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 21 Mar 2004 22:29:11 +0000
Subject: Revise syntax-error reporting behavior to give pleasant results for
 errors in internally-generated queries, such as those submitted by plpgsql
 functions.  Per recent discussions with Fabien Coelho.

---
 src/backend/tcop/postgres.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/backend/tcop/postgres.c')

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 659eda80c85..91442d49e6e 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.395 2004/03/15 15:56:22 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.396 2004/03/21 22:29:11 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2710,6 +2710,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 		 */
 		MemoryContextSwitchTo(TopMemoryContext);
 		MemoryContextResetAndDeleteChildren(ErrorContext);
+		ActivePortal = NULL;
 		PortalContext = NULL;
 		QueryContext = NULL;
 
-- 
cgit v1.2.3