diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 68b1f12e082a09c8197dc1c497cca47c10ec9625..aadc388a44f7902626216b0dedd5e0e9567ebecc 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.96 2002/11/23 04:05:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.97 2002/11/23 18:26:45 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -184,7 +184,7 @@ rebuild_rel(Oid tableOid, Oid indexOid, List *indexes, bool dataCopy)
 	 * If dataCopy is true, we assume that we will be basing the
 	 * copy off an index for cluster operations.
 	 */
-	Assert(!dataCopy || indexOid != NULL);
+	Assert(!dataCopy || OidIsValid(indexOid));
 	/*
 	 * Create the new heap, using a temporary name in the same namespace
 	 * as the existing table.  NOTE: there is some risk of collision with
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index c545b261a5adf2df54507d8d25fe0b1fb696cdcb..8da1de580fb8516320a9f8b4fa6b3aedc4536d90 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.56 2002/11/23 04:05:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.57 2002/11/23 18:26:45 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -449,7 +449,7 @@ TruncateRelation(const RangeVar *relation)
 	 * Do the real work using the same technique as cluster, but
 	 * without the code copy portion
 	 */
-	rebuild_rel(relid, NULL, indexes, false);
+	rebuild_rel(relid, InvalidOid, indexes, false);
 }
 
 /*----------