index_insert has now HeapRelation as last param (for unique index

implementation).

4 files changed, 12 insertions, 11 deletions

diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 539984bc241..d3781d68d49 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.19 1996/12/19 04:58:24 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.20 1997/01/10 09:57:14 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -619,7 +619,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
                                index_nulls,
                                finfoP[i]);
                 indexRes = index_insert(index_rels[i], &idatum, index_nulls,
-                                        &(tuple->t_ctid), false);
+                                        &(tuple->t_ctid), rel);
                 if (indexRes) pfree(indexRes);
             }
         }
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 7e5aff855ff..62609ad1af1 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.12 1997/01/05 10:58:15 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.13 1997/01/10 09:57:16 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1006,7 +1006,7 @@ failed to add item with len = %u to page %u (free space %u, nusd %u, noff %u)",
 				idatum,
 				inulls,
 				&(newtup->t_ctid),
-				true);
+				onerel);
 		    if (iresult) pfree(iresult);
 		}
 	    }
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 94e3a118a30..bd315db65cd 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.6 1996/11/13 20:48:34 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.7 1997/01/10 09:58:53 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1103,10 +1103,10 @@ ExecInsertIndexTuples(TupleTableSlot *slot,
 	
 	
 	result = index_insert(relationDescs[i], /* index relation */
-			      datum,  /* array of heaptuple Datums */
-			      nulls, /* info on nulls */
- 			      &(heapTuple->t_ctid),
-			      is_update); /* oid of heap tuple */
+			      datum,	/* array of heaptuple Datums */
+			      nulls,	/* info on nulls */
+ 			      &(heapTuple->t_ctid),	/* oid of heap tuple */
+			      heapRelation);
 	
 	/* ----------------
 	 *	keep track of index inserts for debugging
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 243bdc28a35..0ac110bab3a 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.7 1996/11/13 20:49:18 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.8 1997/01/10 10:00:39 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1008,7 +1008,8 @@ inv_indextup(LargeObjectDesc *obj_desc, HeapTuple htup)
 
     n[0] = ' ';
     v[0] = Int32GetDatum(obj_desc->highbyte);
-    res = index_insert(obj_desc->index_r, &v[0], &n[0], &(htup->t_ctid), false);
+    res = index_insert(obj_desc->index_r, &v[0], &n[0], 
+    				&(htup->t_ctid), obj_desc->heap_r);
 
     if (res)
 	pfree(res);