diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 1999-08-08 20:24:12 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 1999-08-08 20:24:12 +0000 |
| commit | c6100c9e95a552070655e3919c489815703abdf1 (patch) | |
| tree | 380921ab8d368d2d10feb185834178abedb3bb7f /src/backend/access/transam/xact.c | |
| parent | e947d39eeaf37724d389b3f860cd353aeaca17a5 (diff) | |
Back-patch BTScan abort fix into REL6_5.
Diffstat (limited to 'src/backend/access/transam/xact.c')
| -rw-r--r-- | src/backend/access/transam/xact.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index bd01429d3b1..7eb40c9ab9c 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.42.2.1 1999/08/02 05:56:48 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.42.2.2 1999/08/08 20:24:12 tgl Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -144,9 +144,11 @@ */ #include "postgres.h" +#include "access/nbtree.h" #include "catalog/heap.h" #include "commands/async.h" #include "commands/sequence.h" +#include "commands/vacuum.h" #include "libpq/be-fsstubs.h" #include "storage/proc.h" #include "utils/inval.h" @@ -952,6 +954,7 @@ CommitTransaction() } RelationPurgeLocalRelation(true); + AtEOXact_nbtree(); AtCommit_Cache(); AtCommit_Locks(); AtCommit_Memory(); @@ -1013,9 +1016,12 @@ AbortTransaction() AtAbort_Notify(); CloseSequences(); AtEOXact_portals(); + if (VacuumRunning) + vc_abort(); RecordTransactionAbort(); RelationPurgeLocalRelation(false); DestroyNoNameRels(); + AtEOXact_nbtree(); AtAbort_Cache(); AtAbort_Locks(); AtAbort_Memory(); |