database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-06 19:59:18 +03:00
Code

Oops, in the previous fix to prevent a cursor that's being used in a FOR

Browse Source 
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.
This commit is contained in:
Heikki Linnakangas 2010-07-13 09:02:53 +00:00
parent 371a14255b
commit 49d7a64f60
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/utils/mmgr/portalmem.c
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.97.2.3 2010/07/05 09:27:36 heikki Exp $ * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.97.2.4 2010/07/13 09:02:53 heikki Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -322,6 +322,9 @@ PortalCreateHoldStore(Portal portal)
/* /*
* PinPortal * PinPortal
* Protect a portal from dropping. * Protect a portal from dropping.
*
* A pinned portal is still unpinned and dropped at transaction or
* subtransaction abort.
*/ */
void void
PinPortal(Portal portal) PinPortal(Portal portal)
@ -842,6 +845,14 @@ AtSubCleanup_Portals(SubTransactionId mySubid)
if (portal->createSubid != mySubid) if (portal->createSubid != mySubid)
continue; 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. */ /* Zap it. */
PortalDrop(portal, false); PortalDrop(portal, false);
} }