77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.13 1997/03/24 07:39:47 vadim Exp $
10+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.14 1997/03/27 04:13:44 vadim Exp $
1111 *
1212 *
1313 * INTERFACE ROUTINES
@@ -1714,7 +1714,7 @@ IndexIsUnique(Oid indexId)
17141714ObjectIdGetDatum (indexId ),
171517150 ,0 ,0 );
17161716if (!HeapTupleIsValid (tuple )) {
1717- elog (WARN ,"Can 't find index id %d in IndexIsUnique " ,
1717+ elog (WARN ,"IndexIsUnique: can 't find index id %d" ,
17181718indexId );
17191719 }
17201720index = (IndexTupleForm )GETSTRUCT (tuple );
@@ -1742,7 +1742,6 @@ IndexIsUniqueNoCache(Oid indexId)
17421742ScanKeyData skey [1 ];
17431743HeapScanDesc scandesc ;
17441744HeapTuple tuple ;
1745- Buffer b ;
17461745IndexTupleForm index ;
17471746bool isunique ;
17481747
@@ -1755,15 +1754,16 @@ IndexIsUniqueNoCache(Oid indexId)
17551754
17561755scandesc = heap_beginscan (pg_index ,0 ,SelfTimeQual ,1 ,skey );
17571756
1758- tuple = heap_getnext (scandesc ,0 ,& b );
1757+ tuple = heap_getnext (scandesc ,0 ,NULL );
17591758if (!HeapTupleIsValid (tuple )) {
1760- elog (WARN ,"Can 't find index id %d in IndexIsUniqueNoCache " ,
1759+ elog (WARN ,"IndexIsUniqueNoCache: can 't find index id %d" ,
17611760indexId );
17621761 }
17631762index = (IndexTupleForm )GETSTRUCT (tuple );
17641763Assert (index -> indexrelid == indexId );
17651764isunique = index -> indisunique ;
17661765
1767- ReleaseBuffer (b );
1766+ heap_endscan (scandesc );
1767+ heap_close (pg_index );
17681768return isunique ;
17691769}