index_insert has now HeapRelation as last param (for unique index

implementation).

diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index b851323..d78d5c0 100644 (file)
--- 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.10 1996/11/13 20:47:35 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.11 1997/01/10 09:47:28 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -277,7 +277,7 @@ rtbuild(Relation heap,
  *    It doesn't do any work; just locks the relation and passes the buck.
  */
 InsertIndexResult
-rtinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, bool is_update)
+rtinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel)
 {
     InsertIndexResult res;
     IndexTuple itup;

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 94b09b8..843a1d5 100644 (file)
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.10 1996/11/30 18:05:57 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.11 1997/01/10 09:51:38 vadim Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1597,7 +1597,7 @@ DefaultBuild(Relation heapRelation,
        indexTuple->t_tid = heapTuple->t_ctid;
        
        insertResult = index_insert(indexRelation, datum, nullv, 
-                                   &(heapTuple->t_ctid), false);
+                                   &(heapTuple->t_ctid), heapRelation);
 
        if (insertResult) pfree(insertResult);
        pfree(indexTuple);

diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index ae7db66..111da8c 100644 (file)
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.7 1996/11/26 02:45:05 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.8 1997/01/10 09:51:40 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -184,7 +184,7 @@ CatalogIndexInsert(Relation *idescs,
                           finfoP);
            
            indexRes = index_insert(idescs[i], &datum, nulls, 
-                                   &(heapTuple->t_ctid), false);
+                                   &(heapTuple->t_ctid), heapRelation);
            if (indexRes) pfree(indexRes);
        }
 }