database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

Teach AbortOutOfAnyTransaction to clean up partially-started transactions.

Browse Source 
AbortOutOfAnyTransaction failed to do anything if the state it saw on
entry corresponded to failing partway through StartTransaction.  I fixed
AbortCurrentTransaction to cope with that case way back in commit
60b2444cc3, but evidently overlooked that
AbortOutOfAnyTransaction should do likewise.

Back-patch to all supported branches.  It's not clear that this omission
has any more-than-cosmetic consequences, but it's also not clear that it
doesn't, so back-patching seems the least risky choice.
This commit is contained in:
Tom Lane
2012-05-28 23:57:14 -04:00
parent 2791f2180d
commit cc2469b092
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/backend/access/transam/xact.c
View File

@ -3802,7 +3802,24 @@ AbortOutOfAnyTransaction(void)
switch (s->blockState) switch (s->blockState)
{ {
case TBLOCK_DEFAULT: case TBLOCK_DEFAULT:
/* Not in a transaction, do nothing */ if (s->state == TRANS_DEFAULT)
{
/* Not in a transaction, do nothing */
}
else
{
/*
* We can get here after an error during transaction start
* (state will be TRANS_START). Need to clean up the
* incompletely started transaction. First, adjust the
* low-level state to suppress warning message from
* AbortTransaction.
*/
if (s->state == TRANS_START)
s->state = TRANS_INPROGRESS;
AbortTransaction();
CleanupTransaction();
}
break; break;
case TBLOCK_STARTED: case TBLOCK_STARTED:
case TBLOCK_BEGIN: case TBLOCK_BEGIN: