|
23 | 23 | * Portions Copyright (c) 1994, Regents of the University of California |
24 | 24 | * |
25 | 25 | * IDENTIFICATION |
26 | | - * $PostgreSQL: pgsql/src/backend/utils/time/snapmgr.c,v 1.2 2008/05/12 20:02:02 alvherre Exp $ |
| 26 | + * $PostgreSQL: pgsql/src/backend/utils/time/snapmgr.c,v 1.3 2008/07/11 00:00:29 neilc Exp $ |
27 | 27 | * |
28 | 28 | *------------------------------------------------------------------------- |
29 | 29 | */ |
30 | 30 | #include"postgres.h" |
31 | 31 |
|
32 | | -#include"access/xact.h" |
33 | 32 | #include"access/transam.h" |
| 33 | +#include"access/xact.h" |
34 | 34 | #include"storage/proc.h" |
35 | 35 | #include"storage/procarray.h" |
36 | 36 | #include"utils/memutils.h" |
| 37 | +#include"utils/memutils.h" |
37 | 38 | #include"utils/snapmgr.h" |
38 | 39 | #include"utils/tqual.h" |
39 | | -#include"utils/memutils.h" |
40 | 40 |
|
41 | 41 |
|
42 | 42 | /* |
@@ -70,7 +70,7 @@ TransactionId RecentGlobalXmin = FirstNormalTransactionId; |
70 | 70 | * |
71 | 71 | * Note that we keep refcounts both here and in SnapshotData. This is because |
72 | 72 | * the same snapshot may be registered more than once in a subtransaction, and |
73 | | - * if a subxact aborts we want to be able tosubstract the correct amount of |
| 73 | + * if a subxact aborts we want to be able tosubtract the correct amount of |
74 | 74 | * counts from SnapshotData. (Another approach would be keeping one |
75 | 75 | * RegdSnapshotElt each time a snapshot is registered, but that seems |
76 | 76 | * unnecessary wastage.) |
@@ -350,7 +350,7 @@ GetActiveSnapshot(void) |
350 | 350 |
|
351 | 351 | /* |
352 | 352 | * ActiveSnapshotSet |
353 | | - * Return whether there is at least onesnapsho in the Active stack |
| 353 | + * Return whether there is at least onesnapshot in the Active stack |
354 | 354 | */ |
355 | 355 | bool |
356 | 356 | ActiveSnapshotSet(void) |
@@ -628,7 +628,7 @@ AtEOXact_Snapshot(bool isCommit) |
628 | 628 | } |
629 | 629 |
|
630 | 630 | /* |
631 | | - * And reset our state. We don't need to free the memoryexplicitely -- |
| 631 | + * And reset our state. We don't need to free the memoryexplicitly -- |
632 | 632 | * it'll go away with TopTransactionContext. |
633 | 633 | */ |
634 | 634 | ActiveSnapshot=NULL; |
|
