postgrespro
diff --git a/‎doc/src/sgml/ref/allfiles.sgml
Lines changed: 1 addition & 2 deletions b/‎doc/src/sgml/ref/allfiles.sgml
Lines changed: 1 addition & 2 deletions
diff --git a/‎doc/src/sgml/ref/alter_domain.sgml
Lines changed: 0 additions & 237 deletions b/‎doc/src/sgml/ref/alter_domain.sgml
Lines changed: 0 additions & 237 deletions
diff --git a/‎doc/src/sgml/reference.sgml
Lines changed: 1 addition & 2 deletions b/‎doc/src/sgml/reference.sgml
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/backend/catalog/dependency.c
Lines changed: 1 addition & 2 deletions b/‎src/backend/catalog/dependency.c
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/backend/catalog/pg_constraint.c
Lines changed: 4 additions & 11 deletions b/‎src/backend/catalog/pg_constraint.c
Lines changed: 4 additions & 11 deletions
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.50 2002/12/06 03:28:27 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.51 2002/12/06 03:42:52 momjian Exp $
 PostgreSQL documentation
 Complete list of usable sgml source files in this directory.
 -->
@@ -38,7 +38,6 @@ Complete list of usable sgml source files in this directory.
 <!-- SQL commands -->
 <!entity abort              system "abort.sgml">
 <!entity alterDatabase      system "alter_database.sgml">
-<!entity alterDomain        system "alter_domain.sgml">
 <!entity alterGroup         system "alter_group.sgml">
 <!entity alterTable         system "alter_table.sgml">
 <!entity alterTrigger       system "alter_trigger.sgml">
 
@@ -1,5 +1,5 @@
 <!-- reference.sgml
-$Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.39 2002/12/06 03:28:27 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.40 2002/12/06 03:42:48 momjian Exp $
 
 PostgreSQL Reference Manual
 -->
@@ -47,7 +47,6 @@ PostgreSQL Reference Manual
 
    &abort;
    &alterDatabase;
-   &alterDomain;
    &alterGroup;
    &alterTable;
    &alterTrigger;
 
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.15 2002/12/06 03:28:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.16 2002/12/06 03:42:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,7 +36,6 @@
 #include "commands/proclang.h"
 #include "commands/schemacmds.h"
 #include "commands/trigger.h"
-#include "commands/typecmds.h"
 #include "lib/stringinfo.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_constraint.c,v 1.9 2002/12/06 03:28:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_constraint.c,v 1.10 2002/12/06 03:42:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -199,7 +199,6 @@ CreateConstraintEntry(const char *constraintName,
 
 		domobject.classId = RelOid_pg_type;
 		domobject.objectId = domainId;
-		domobject.objectSubId = 0;
 
 		recordDependencyOn(&conobject, &domobject, DEPENDENCY_AUTO);
 	}
@@ -497,16 +496,15 @@ RemoveConstraintById(Oid conId)
 		HeapTuple	typTup;
 		ScanKeyData typKey[1];
 		SysScanDesc typScan;
-		int			nkeys = 0;
 
 		typRel = heap_openr(TypeRelationName, RowExclusiveLock);
 
-		ScanKeyEntryInitialize(&typKey[nkeys++], 0x0,
-							   ObjectIdAttributeNumber, F_OIDEQ,
+		ScanKeyEntryInitialize(&typKey[0], 0x0,
+							   Anum_pg_constraint_contypid, F_OIDEQ,
 							   ObjectIdGetDatum(con->contypid));
 
 		typScan = systable_beginscan(typRel, TypeOidIndex, true,
-									 SnapshotNow, nkeys, typKey);
+									 SnapshotNow, 1, typKey);
 
 		typTup = systable_getnext(typScan);
 
@@ -519,11 +517,6 @@ RemoveConstraintById(Oid conId)
 		/* Keep lock on domain type until end of xact */
 		heap_close(typRel, NoLock);
 	}
-	else
-	{
-		elog(ERROR, "RemoveConstraintById: Constraint %u is not a known type",
-			 conId);
-	}
 
 	/* Fry the constraint itself */
 	simple_heap_delete(conDesc, &tup->t_self);