Index: src/test/regress/expected/domain.out
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/test/regress/expected/domain.out,v
retrieving revision 1.7
diff -c -r1.7 domain.out
*** src/test/regress/expected/domain.out	2002/07/12 18:43:19	1.7
--- src/test/regress/expected/domain.out	2002/08/20 15:54:53
***************
*** 143,154 ****
              ( col1 ddef1
              , col2 ddef2
              , col3 ddef3
!             , col4 ddef4
              , col5 ddef1 NOT NULL DEFAULT NULL
              , col6 ddef2 DEFAULT '88'
              , col7 ddef4 DEFAULT 8000
  		, col8 ddef5
              );
  insert into defaulttest default values;
  insert into defaulttest default values;
  insert into defaulttest default values;
--- 143,155 ----
              ( col1 ddef1
              , col2 ddef2
              , col3 ddef3
!             , col4 ddef4 PRIMARY KEY
              , col5 ddef1 NOT NULL DEFAULT NULL
              , col6 ddef2 DEFAULT '88'
              , col7 ddef4 DEFAULT 8000
  		, col8 ddef5
              );
+ NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index 'defaulttest_pkey' for table 'defaulttest'
  insert into defaulttest default values;
  insert into defaulttest default values;
  insert into defaulttest default values;
Index: src/test/regress/expected/type_sanity.out
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/test/regress/expected/type_sanity.out,v
retrieving revision 1.10
diff -c -r1.10 type_sanity.out
*** src/test/regress/expected/type_sanity.out	2002/08/04 19:48:11	1.10
--- src/test/regress/expected/type_sanity.out	2002/08/20 15:54:53
***************
*** 16,22 ****
  SELECT p1.oid, p1.typname
  FROM pg_type as p1
  WHERE (p1.typlen <= 0 AND p1.typlen != -1) OR
!     (p1.typtype != 'b' AND p1.typtype != 'c' AND p1.typtype != 'p') OR
      NOT p1.typisdefined OR
      (p1.typalign != 'c' AND p1.typalign != 's' AND
       p1.typalign != 'i' AND p1.typalign != 'd') OR
--- 16,22 ----
  SELECT p1.oid, p1.typname
  FROM pg_type as p1
  WHERE (p1.typlen <= 0 AND p1.typlen != -1) OR
!     p1.typtype not in('b', 'c', 'd', 'p') OR
      NOT p1.typisdefined OR
      (p1.typalign != 'c' AND p1.typalign != 's' AND
       p1.typalign != 'i' AND p1.typalign != 'd') OR
***************
*** 60,66 ****
  -- NOTE: as of 7.3, this check finds SET, smgr, and unknown.
  SELECT p1.oid, p1.typname
  FROM pg_type as p1
! WHERE p1.typtype = 'b' AND p1.typname NOT LIKE '\\_%' AND NOT EXISTS
      (SELECT 1 FROM pg_type as p2
       WHERE p2.typname = ('_' || p1.typname)::name AND
             p2.typelem = p1.oid);
--- 60,66 ----
  -- NOTE: as of 7.3, this check finds SET, smgr, and unknown.
  SELECT p1.oid, p1.typname
  FROM pg_type as p1
! WHERE p1.typtype in ('b','d') AND p1.typname NOT LIKE '\\_%' AND NOT EXISTS
      (SELECT 1 FROM pg_type as p2
       WHERE p2.typname = ('_' || p1.typname)::name AND
             p2.typelem = p1.oid);
