|
16 | 16 | * Portions Copyright (c) 1994, Regents of the University of California |
17 | 17 | * |
18 | 18 | * IDENTIFICATION |
19 | | - * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.49 2002/01/16 23:51:56 tgl Exp $ |
| 19 | + * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.50 2002/05/06 02:39:01 tgl Exp $ |
20 | 20 | * |
21 | 21 | *------------------------------------------------------------------------- |
22 | 22 | */ |
@@ -707,13 +707,12 @@ HeapTupleSatisfiesSnapshot(HeapTupleHeader tuple, Snapshot snapshot) |
707 | 707 | * By here, the inserting transaction has committed - have to check |
708 | 708 | * when... |
709 | 709 | */ |
710 | | - |
711 | | -if (TransactionIdFollowsOrEquals(tuple->t_xmin,snapshot->xmax)) |
712 | | -return false; |
713 | 710 | if (TransactionIdFollowsOrEquals(tuple->t_xmin,snapshot->xmin)) |
714 | 711 | { |
715 | 712 | uint32i; |
716 | 713 |
|
| 714 | +if (TransactionIdFollowsOrEquals(tuple->t_xmin,snapshot->xmax)) |
| 715 | +return false; |
717 | 716 | for (i=0;i<snapshot->xcnt;i++) |
718 | 717 | { |
719 | 718 | if (TransactionIdEquals(tuple->t_xmin,snapshot->xip[i])) |
@@ -748,12 +747,15 @@ HeapTupleSatisfiesSnapshot(HeapTupleHeader tuple, Snapshot snapshot) |
748 | 747 | tuple->t_infomask |=HEAP_XMAX_COMMITTED; |
749 | 748 | } |
750 | 749 |
|
751 | | -if (TransactionIdFollowsOrEquals(tuple->t_xmax,snapshot->xmax)) |
752 | | -return true; |
| 750 | +/* |
| 751 | + * OK, the deleting transaction committed too ... but when? |
| 752 | + */ |
753 | 753 | if (TransactionIdFollowsOrEquals(tuple->t_xmax,snapshot->xmin)) |
754 | 754 | { |
755 | 755 | uint32i; |
756 | 756 |
|
| 757 | +if (TransactionIdFollowsOrEquals(tuple->t_xmax,snapshot->xmax)) |
| 758 | +return true; |
757 | 759 | for (i=0;i<snapshot->xcnt;i++) |
758 | 760 | { |
759 | 761 | if (TransactionIdEquals(tuple->t_xmax,snapshot->xip[i])) |
|