From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Tue, 13 Jul 2010 09:02:35 +0000 (+0000)
Subject: Oops, in the previous fix to prevent a cursor that's being used in a FOR
X-Git-Tag: REL9_0_BETA4~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41252a12d6d5bdd5fc75ea1bf411f8903f7c14ac;p=thirdparty%2Fpostgresql.git

Oops, in the previous fix to prevent a cursor that's being used in a FOR
loop from being dropped, I missed subtransaction cleanup. Pinned portals
must be dropped at subtransaction cleanup just as they are at main
transaction cleanup.

Per bug #5556 by Robert Walker. Backpatch to 8.0, 7.4 didn't have
subtransactions.
---

diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 5dc60d9754f..19c594df8ac 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.120 2010/07/06 19:18:59 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.120.2.1 2010/07/13 09:02:35 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -379,6 +379,9 @@ PortalCreateHoldStore(Portal portal)
 /*
  * PinPortal
  *		Protect a portal from dropping.
+ *
+ * A pinned portal is still unpinned and dropped at transaction or
+ * subtransaction abort.
  */
 void
 PinPortal(Portal portal)
@@ -902,6 +905,14 @@ AtSubCleanup_Portals(SubTransactionId mySubid)
 		if (portal->createSubid != mySubid)
 			continue;
 
+		/*
+		 * If a portal is still pinned, forcibly unpin it. PortalDrop will not
+		 * let us drop the portal otherwise. Whoever pinned the portal was
+		 * interrupted by the abort too and won't try to use it anymore.
+		 */
+		if (portal->portalPinned)
+			portal->portalPinned = false;
+
 		/* Zap it. */
 		PortalDrop(portal, false);
 	}