From f4213e6b2310c69628c8340c4176ddb9383c1c3d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 10 May 1999 04:02:07 +0000
Subject: [PATCH] Fix initdb problem introduced by recent patch.

---
 src/backend/catalog/heap.c    | 10 +++++-----
 src/backend/utils/fmgr/fmgr.c |  4 ++--
 src/include/catalog/pg_type.h |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index d87f5959b0..0caf676bd0 100644
--- 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 5b0de72c68..09f9a16113 100644
--- 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 bb5dc34551..06e3733f80 100644
--- 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