diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2012-05-28 23:57:14 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2012-05-28 23:57:14 -0400 |
| commit | cc2469b0925812424efc8aa24234fc3090a5e85e (patch) | |
| tree | 3aa25f1a5cde0fbbd6005cc735ef737fbd0e23eb | |
| parent | 2791f2180d8e7c469fac2a4d88fc449689e4c970 (diff) | |
| download | postgresql-cc2469b0925812424efc8aa24234fc3090a5e85e.tar.gz postgresql-cc2469b0925812424efc8aa24234fc3090a5e85e.zip | |
Teach AbortOutOfAnyTransaction to clean up partially-started transactions.
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
60b2444cc3ba037630c9b940c3c9ef01b954b87b, 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.
| -rw-r--r-- | src/backend/access/transam/xact.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index b34b418fd98..184fe28f5c5 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -3802,7 +3802,24 @@ AbortOutOfAnyTransaction(void) switch (s->blockState) { 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; case TBLOCK_STARTED: case TBLOCK_BEGIN: |