Fix initdb problem introduced by recent patch.

bmomjian · bmomjian · commit f4213e6b2310 · 1999-05-10T04:02:07.000Z
diff --git 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
@@ -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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.78 1999/05/10 00:44:54 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.79 1999/05/10 04:02:03 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`@@ -761,10 +761,10 @@ AddNewRelationType(char *typeName, Oid new_rel_oid)`
`761`	`761`	`typeLen(typeidType(OIDOID)), /* external size */`
`762`	`762`	`'c', /* type-type (catalog) */`
`763`	`763`	`',', /* default array delimiter */`
`764`		`- "oidin", /* input procedure */`
`765`		`- "oidout", /* output procedure */`
`766`		`- "oidin", /* receive procedure */`
`767`		`- "oidout", /* send procedure */`
	`764`	`+ "int4in", /* input procedure */`
	`765`	`+ "int4out", /* output procedure */`
	`766`	`+ "int4in", /* receive procedure */`
	`767`	`+ "int4out", /* send procedure */`
`768`	`768`	`NULL, /* array element type - irrelevent */`
`769`	`769`	`"-", /* default type value */`
`770`	`770`	`(bool) 1, /* passed by value */`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: pg_type.h,v 1.60 1999/05/10 00:46:20 momjian Exp $`
	`10`	`+ * $Id: pg_type.h,v 1.61 1999/05/10 04:02:07 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* 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`
`198`	`198`	`DESCR("native variable-length string");`
`199`	`199`	`#define TEXTOID 25`
`200`	`200`
`201`		`-DATA(insert OID = 26 ( oid PGUID 4 10 t b t \054 0 0 oidin oidout oidin oidout i _null_ ));`
	`201`	`+DATA(insert OID = 26 ( oid PGUID 4 10 t b t \054 0 0 int4in int4out int4in int4out i _null_ ));`
`202`	`202`	`DESCR("object identifier type");`
`203`	`203`	`#define OIDOID 26`
`204`	`204`