3 files changed, 14 insertions, 7 deletions
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index 401ceca1c9..932feec0b3 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.5 1996/11/10 02:58:53 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.6 1997/03/14 23:17:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@
 #include <postgres.h>
 
 #include <utils/builtins.h>
-#include <utils/geo-decls.h>
+#include <utils/geo_decls.h>
 #ifndef HAVE_MEMMOVE
 # include <regex/utils.h>
 #else
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index d78d5c0a26..b2a50860e8 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.11 1997/01/10 09:47:28 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.12 1997/03/14 23:17:46 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
 #include <storage/lmgr.h>
 #include <access/rtree.h>
 #include <storage/bufmgr.h>
-#include <utils/geo-decls.h>
+#include <utils/geo_decls.h>
 #include <executor/executor.h>
 #include <access/heapam.h>
 #include <fmgr.h>
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 3cb49b8e27..d74576e723 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.7 1997/03/12 20:41:14 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.8 1997/03/14 23:18:16 scrappy Exp $
  *	
  * NOTES
  *	Transaction aborts can now occur two ways:
@@ -171,7 +171,14 @@ TransactionState CurrentTransactionState =
     &CurrentTransactionStateData;
 
 /* ----------------
- *	info returned when the system is desabled
+ *	info returned when the system is disabled
+ *
+ * Apparently a lot of this code is inherited from other prototype systems.
+ * For DisabledStartTime, use a symbolic value to make the relationships clearer.
+ * The old value of 1073741823 corresponds to a date in y2004, which is coming closer
+ *  every day. It appears that if we return a value guaranteed larger than
+ *  any real time associated with a transaction then comparisons in other
+ *  modules will still be correct. Let's use BIG_ABSTIME for this. tgl 2/14/97
  *
  *	Note:  I have no idea what the significance of the
  *	       1073741823 in DisabledStartTime.. I just carried
@@ -183,7 +190,7 @@ TransactionId DisabledTransactionId = (TransactionId)-1;
      
 CommandId DisabledCommandId = (CommandId) -1;
      
-AbsoluteTime DisabledStartTime = (AbsoluteTime) 1073741823;
+AbsoluteTime DisabledStartTime = (AbsoluteTime) BIG_ABSTIME; /* 1073741823; */
      
 /* ----------------
  *	overflow flag