Fix initdb problem introduced by recent patch.

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index d87f5959b0446fe5f7ea75953a538ab5f1be56f2..0caf676bd0f584f63af083402159a8c75cfb7042 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.78 1999/05/10 00:44:54 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.79 1999/05/10 04:02:03 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -761,10 +761,10 @@ AddNewRelationType(char *typeName, Oid new_rel_oid)
                                                          typeLen(typeidType(OIDOID)),          /* external size */
                                                          'c',          /* type-type (catalog) */
                                                          ',',          /* default array delimiter */
-                                                         "oidin", /* input procedure */
-                                                         "oidout",             /* output procedure */
-                                                         "oidin", /* receive procedure */
-                                                         "oidout",             /* send procedure */
+                                                         "int4in", /* input procedure */
+                                                         "int4out",            /* output procedure */
+                                                         "int4in", /* receive procedure */
+                                                         "int4out",            /* send procedure */
                                                          NULL,         /* array element type - irrelevent */
                                                          "-",          /* default type value */
                                                          (bool) 1, /* passed by value */

diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 5b0de72c685d6b22a2b8a79e2efd9b8a53a9fbed..09f9a161138bae1ccdfdb2dd1e347706c65f416c 100644 (file)
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.26 1999/05/10 00:46:14 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.27 1999/05/10 04:02:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -277,7 +277,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
                                                                                                        0, 0, 0);
                                if (!HeapTupleIsValid(languageTuple))
                                {
-                                       elog(ERROR, "fmgr_info: %u",
+                                       elog(ERROR, "fmgr_info: %s %u",
                                                 "Cache lookup for language failed",
                                                 DatumGetObjectId(procedureStruct->prolang));
                                }

diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index bb5dc34551233a900983059beb29ad630c667149..06e3733f80ab7c5146bba2581c25640a927187e2 100644 (file)
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.60 1999/05/10 00:46:20 momjian Exp $
+ * $Id: pg_type.h,v 1.61 1999/05/10 04:02:07 momjian Exp $
  *
  * NOTES
  *       the genbki.sh script reads this file and generates .bki
@@ -198,7 +198,7 @@ DATA(insert OID = 25 (      text       PGUID -1  -1 f b t \054 0  18 textin textout text
 DESCR("native variable-length string");
 #define TEXTOID                        25
 
-DATA(insert OID = 26 ( oid                PGUID  4  10 t b t \054 0   0 oidin oidout oidin oidout i _null_ ));
+DATA(insert OID = 26 ( oid                PGUID  4  10 t b t \054 0   0 int4in int4out int4in int4out i _null_ ));
 DESCR("object identifier type");
 #define OIDOID                 26