Remove unused system table columns:

pg_language.lancompiler pg_operator.oprprec pg_operator.oprisleft pg_proc.proimplicit pg_proc.probyte_pct pg_proc.properbyte_cpu pg_proc.propercall_cpu pg_proc.prooutin_ratio pg_shadow.usetrace pg_type.typprtlen pg_type.typreceive pg_type.typsend Attempts to use the obsoleted attributes of pg_operator or pg_proc in the CREATE commands will be greeted by a warning. For pg_type, there is no warning (yet) because pg_dump scripts still contain these attributes. Also remove new but already obsolete spellings isVolatile, isStable, isImmutable in WITH clause. (Use new syntax instead.)

Remove unused system table columns:
pg_language.lancompiler pg_operator.oprprec pg_operator.oprisleft pg_proc.proimplicit pg_proc.probyte_pct pg_proc.properbyte_cpu pg_proc.propercall_cpu pg_proc.prooutin_ratio pg_shadow.usetrace pg_type.typprtlen pg_type.typreceive pg_type.typsend Attempts to use the obsoleted attributes of pg_operator or pg_proc in the CREATE commands will be greeted by a warning. For pg_type, there is no warning (yet) because pg_dump scripts still contain these attributes. Also remove new but already obsolete spellings isVolatile, isStable, isImmutable in WITH clause. (Use new syntax instead.)
739adf32 · Peter Eisentraut · a7877755 · 739adf32 · 739adf32 · 739adf32
Commit 739adf32 authored Jul 24, 2002 by Peter Eisentraut
36 changed files
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
 <!--
 Documentation of the system catalogs, directed toward PostgreSQL developers
- $Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.47 2002/07/24 05:51:55 ishii Exp $
+ $Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.48 2002/07/24 19:11:06 petere Exp $
 -->

 <chapter id="catalogs">
@@ -1734,13 +1734,6 @@
      </entry>
     </row>

-     <row>
-      <entry>lancompiler</entry>
-      <entry><type>text</type></entry>
-      <entry></entry>
-      <entry>not currently used</entry>
-     </row>
-
     <row>
      <entry>lanacl</entry>
      <entry><type>aclitem[]</type></entry>
@@ -1976,14 +1969,6 @@
      <entry>Owner (creator) of the operator</entry>
     </row>

-     <row>
-      <entry>oprprec</entry>
-      <entry><type>int2</type></entry>
-      <entry></entry>
-      <entry>precedence (currently unused, as precedences are hard-wired
-      in the grammar)</entry>
-     </row>
-
     <row>
      <entry>oprkind</entry>
      <entry><type>char</type></entry>
@@ -1994,14 +1979,6 @@
      </entry>
     </row>

-     <row>
-      <entry>oprisleft</entry>
-      <entry><type>bool</type></entry>
-      <entry></entry>
-      <entry>left-associativity (currently unused, as this is hard-wired
-      in the grammar)</entry>
-     </row>
-
     <row>
      <entry>oprcanhash</entry>
      <entry><type>bool</type></entry>
@@ -2185,13 +2162,6 @@
      <entry>not functional</entry>
     </row>

-     <row>
-      <entry>proimplicit</entry>
-      <entry><type>bool</type></entry>
-      <entry></entry>
-      <entry>Function may be invoked as an implicit type coercion</entry>
-     </row>
-
     <row>
      <entry>proisstrict</entry>
      <entry><type>bool</type></entry>
@@ -2252,34 +2222,6 @@
      <entry>A vector with the data types of the function arguments</entry>
     </row>

-     <row>
-      <entry>probyte_pct</entry>
-      <entry><type>int4</type></entry>
-      <entry></entry>
-      <entry>dead code</entry>
-     </row>
-
-     <row>
-      <entry>properbyte_cpu</entry>
-      <entry><type>int4</type></entry>
-      <entry></entry>
-      <entry>dead code</entry>
-     </row>
-
-     <row>
-      <entry>propercall_cpu</entry>
-      <entry><type>int4</type></entry>
-      <entry></entry>
-      <entry>dead code</entry>
-     </row>
-
-     <row>
-      <entry>prooutin_ratio</entry>
-      <entry><type>int4</type></entry>
-      <entry></entry>
-      <entry>dead code</entry>
-     </row>
-
     <row>
      <entry>prosrc</entry>
      <entry><type>text</type></entry>
@@ -2471,13 +2413,6 @@
      <entry>User may create databases</entry>
     </row>

-     <row>
-      <entry>usetrace</entry>
-      <entry><type>bool</type></entry>
-      <entry></entry>
-      <entry>not used</entry>
-     </row>
-
     <row>
      <entry>usesuper</entry>
      <entry><type>bool</type></entry>
@@ -2843,13 +2778,6 @@
      <entry>Length of the storage representation of the type, -1 if variable length</entry>
     </row>

-     <row>
-      <entry>typprtlen</entry>
-      <entry><type>int2</type></entry>
-      <entry></entry>
-      <entry>unused</entry>
-     </row>
-
     <row>
      <entry>typbyval</entry>
      <entry><type>bool</type></entry>
@@ -2952,20 +2880,6 @@
      <entry>Output function</entry>
     </row>

-     <row>
-      <entry>typreceive</entry>
-      <entry><type>regproc</type></entry>
-      <entry>pg_proc.oid</entry>
-      <entry>unused</entry>
-     </row>
-
-     <row>
-      <entry>typsend</entry>
-      <entry><type>regproc</type></entry>
-      <entry>pg_proc.oid</entry>
-      <entry>unused</entry>
-     </row>
-
     <row>
      <entry>typalign</entry>
      <entry><type>char</type></entry>

--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_function.sgml,v 1.40 2002/07/18 23:11:27 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_function.sgml,v 1.41 2002/07/24 19:11:07 petere Exp $
 -->

 <refentry id="SQL-CREATEFUNCTION">
@@ -257,16 +257,11 @@ CREATE [ OR REPLACE ] FUNCTION <replaceable class="parameter">name</replaceable>
       </varlistentry>

       <varlistentry>
-        <term>isImmutable</term>
        <term>isCachable</term>
-        <term>isStable</term>
-        <term>isVolatile</term>
        <listitem>
         <para>
-          Equivalent to <literal>IMMUTABLE</literal>,
-          <literal>STABLE</literal>, <literal>VOLATILE</literal>.
          <literal>isCachable</literal> is an obsolete equivalent of
-          <literal>isImmutable</literal>; it's still accepted for
+          <literal>IMMUTABLE</literal>; it's still accepted for
          backwards-compatibility reasons.
         </para>
        </listitem>

--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.25 2002/06/20 15:44:06 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.26 2002/07/24 19:11:07 petere Exp $
 PostgreSQL documentation
 -->

@@ -221,14 +221,13 @@ ERROR:  PL handler function <replaceable class="parameter">funcname</replaceable
 lanpltrusted  | boolean   |
 lanplcallfoid | oid       |
 lanvalidator  | oid       |
- lancompiler   | text      |
 lanacl        | aclitem[] |

-   lanname   | lanispl | lanpltrusted | lanplcallfoid | lanvalidator | lancompiler | lanacl
-------------+---------+--------------+---------------+--------------+-------------+--------
- internal    | f       | f            |             0 |         2246 | n/a         |
- c           | f       | f            |             0 |         2247 | /bin/cc     |
- sql         | f       | t            |             0 |         2248 | postgres    | {=U}
+   lanname   | lanispl | lanpltrusted | lanplcallfoid | lanvalidator | lanacl
+-------------+---------+--------------+---------------+--------------+--------
+ internal    | f       | f            |             0 |         2246 |
+ c           | f       | f            |             0 |         2247 |
+ sql         | f       | t            |             0 |         2248 | {=U}
 </screen>
  </para>


--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.29 2002/05/18 15:44:47 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.30 2002/07/24 19:11:07 petere Exp $
 PostgreSQL documentation
 -->

@@ -24,10 +24,8 @@ PostgreSQL documentation
 CREATE TYPE <replaceable class="parameter">typename</replaceable> ( INPUT = <replaceable class="parameter">input_function</replaceable>, OUTPUT = <replaceable class="parameter">output_function</replaceable>
      , INTERNALLENGTH = { <replaceable
      class="parameter">internallength</replaceable> | VARIABLE }
-    [ , EXTERNALLENGTH = { <replaceable class="parameter">externallength</replaceable> | VARIABLE } ]
    [ , DEFAULT = <replaceable class="parameter">default</replaceable> ]
    [ , ELEMENT = <replaceable class="parameter">element</replaceable> ] [ , DELIMITER = <replaceable class="parameter">delimiter</replaceable> ]
-    [ , SEND = <replaceable class="parameter">send_function</replaceable> ] [ , RECEIVE = <replaceable class="parameter">receive_function</replaceable> ]
    [ , PASSEDBYVALUE ]
    [ , ALIGNMENT = <replaceable class="parameter">alignment</replaceable> ]
    [ , STORAGE = <replaceable class="parameter">storage</replaceable> ]
@@ -63,16 +61,6 @@ CREATE TYPE <replaceable class="parameter">typename</replaceable> ( INPUT = <rep
      </listitem>
     </varlistentry>

-     <varlistentry>
-      <term><replaceable class="parameter">externallength</replaceable></term>
-      <listitem>
-       <para>
-	A literal value, which specifies the external (displayed) length of
-	the new type.
-       </para>
-      </listitem>
-     </varlistentry>
-
     <varlistentry>
      <term><replaceable class="parameter">input_function</replaceable></term>
      <listitem>
@@ -126,26 +114,6 @@ CREATE TYPE <replaceable class="parameter">typename</replaceable> ( INPUT = <rep
       </para>
      </listitem>
     </varlistentry>
-     <varlistentry>
-      <term><replaceable class="parameter">send_function</replaceable></term>
-      <listitem>
-       <para>
-	The name of a function, created by <command>CREATE FUNCTION</command>, which
-	converts data of this type into a form suitable for
-	transmission to another machine.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term><replaceable class="parameter">receive_function</replaceable></term>
-      <listitem>
-       <para>
-	The name of a function, created by <command>CREATE FUNCTION</command>, which
-	converts data of this type from a form suitable for
-	transmission from another machine to internal form.
-       </para>
-      </listitem>
-     </varlistentry>

     <varlistentry>
      <term><replaceable class="parameter">alignment</replaceable></term>
@@ -259,13 +227,6 @@ CREATE TYPE
   length of this value of the type.
  </para>

-  <para>
-   The external representation length is  similarly specified using the
-   <replaceable class="parameter">externallength</replaceable>
-   keyword.  (This value is not presently used, and is typically omitted,
-   letting it default to <option>VARIABLE</option>.)
-  </para>
-
  <para>
   To indicate that a type is an array,
   specify the type  of  the  array
@@ -292,18 +253,6 @@ CREATE TYPE
   clause attached to a particular column.)
  </para>

-  <para>
-   The optional arguments
-   <replaceable class="parameter">send_function</replaceable> and
-   <replaceable class="parameter">receive_function</replaceable>
-   are not currently used, and are usually omitted (allowing them
-   to default to the 
-   <replaceable class="parameter">output_function</replaceable> and
-   <replaceable class="parameter">input_function</replaceable>
-   respectively).  These functions may someday be resurrected for use
-   in specifying machine-independent binary representations.
-  </para>
-
  <para>
   The  optional flag,  <option>PASSEDBYVALUE</option>, indicates that
   values of this data type are passed

--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.212 2002/07/20 05:16:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.213 2002/07/24 19:11:07 petere Exp $
 *
 *
 * INTERFACE ROUTINES
@@ -641,13 +641,10 @@ AddNewRelationType(const char *typeName,
 			   new_type_oid,	/* preassigned oid for type */
 			   new_rel_oid,		/* relation oid */
 			   sizeof(Oid),		/* internal size */
-			   -1,				/* external size */
 			   'c',				/* type-type (complex) */
 			   ',',				/* default array delimiter */
 			   F_OIDIN,			/* input procedure */
 			   F_OIDOUT,		/* output procedure */
-			   F_OIDIN,			/* receive procedure */
-			   F_OIDOUT,		/* send procedure */
 			   InvalidOid,		/* array element type - irrelevant */
 			   InvalidOid,		/* domain base type - irrelevant */
 			   NULL,			/* default type value - none */

--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.51 2002/07/18 23:11:27 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.52 2002/07/24 19:11:07 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -146,10 +146,6 @@ AggregateCreate(const char *aggName,
 							  false,		/* security invoker (currently not definable for agg) */
 							  false,		/* isStrict (not needed for agg) */
 							  PROVOLATILE_IMMUTABLE,	/* volatility (not needed for agg) */
-							  BYTE_PCT,		/* default cost values */
-							  PERBYTE_CPU,
-							  PERCALL_CPU,
-							  OUTIN_RATIO,
 							  1,			/* parameterCount */
 							  fnArgs);		/* parameterTypes */


--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.73 2002/07/20 05:16:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.74 2002/07/24 19:11:08 petere Exp $
 *
 * NOTES
 *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -232,9 +232,7 @@ OperatorShellMake(const char *operatorName,
 	values[i++] = NameGetDatum(&oname);				/* oprname */
 	values[i++] = ObjectIdGetDatum(operatorNamespace);	/* oprnamespace */
 	values[i++] = Int32GetDatum(GetUserId());		/* oprowner */
-	values[i++] = UInt16GetDatum(0);				/* oprprec */
 	values[i++] = CharGetDatum(leftTypeId ? (rightTypeId ? 'b' : 'r') : 'l');	/* oprkind */
-	values[i++] = BoolGetDatum(false);				/* oprisleft */
 	values[i++] = BoolGetDatum(false);				/* oprcanhash */
 	values[i++] = ObjectIdGetDatum(leftTypeId);		/* oprleft */
 	values[i++] = ObjectIdGetDatum(rightTypeId);	/* oprright */
@@ -296,8 +294,6 @@ OperatorShellMake(const char *operatorName,
 *		leftTypeId				X left type ID
 *		rightTypeId				X right type ID
 *		procedureName			procedure for operator
- *		precedence				operator precedence
- *		isLeftAssociative		operator is left associative
 *		commutatorName			X commutator operator
 *		negatorName				X negator operator
 *		restrictionName			X restriction sel. procedure
@@ -331,9 +327,7 @@ OperatorShellMake(const char *operatorName,
 * assign values to the fields of the operator:
 *	 operatorName
 *	 owner id (simply the user id of the caller)
- *	 precedence
 *	 operator "kind" either "b" for binary or "l" for left unary
- *	 isLeftAssociative boolean
 *	 canHash boolean
 *	 leftTypeObjectId -- type must already be defined
 *	 rightTypeObjectId -- this is optional, enter ObjectId=0 if none specified
@@ -373,8 +367,6 @@ OperatorCreate(const char *operatorName,
 			   Oid leftTypeId,
 			   Oid rightTypeId,
 			   List *procedureName,
-			   uint16 precedence,
-			   bool isLeftAssociative,
 			   List *commutatorName,
 			   List *negatorName,
 			   List *restrictionName,
@@ -524,9 +516,7 @@ OperatorCreate(const char *operatorName,
 	values[i++] = NameGetDatum(&oname);			/* oprname */
 	values[i++] = ObjectIdGetDatum(operatorNamespace);	/* oprnamespace */
 	values[i++] = Int32GetDatum(GetUserId());		/* oprowner */
-	values[i++] = UInt16GetDatum(precedence);		/* oprprec */
 	values[i++] = CharGetDatum(leftTypeId ? (rightTypeId ? 'b' : 'r') : 'l');	/* oprkind */
-	values[i++] = BoolGetDatum(isLeftAssociative);	/* oprisleft */
 	values[i++] = BoolGetDatum(canHash);			/* oprcanhash */
 	values[i++] = ObjectIdGetDatum(leftTypeId);		/* oprleft */
 	values[i++] = ObjectIdGetDatum(rightTypeId);	/* oprright */

--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.80 2002/07/20 05:16:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.81 2002/07/24 19:11:09 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -57,10 +57,6 @@ ProcedureCreate(const char *procedureName,
 				bool security_definer,
 				bool isStrict,
 				char volatility,
-				int32 byte_pct,
-				int32 perbyte_cpu,
-				int32 percall_cpu,
-				int32 outin_ratio,
 				int parameterCount,
 				const Oid *parameterTypes)
 {
@@ -162,17 +158,12 @@ ProcedureCreate(const char *procedureName,
 	values[i++] = ObjectIdGetDatum(languageObjectId); /* prolang */
 	values[i++] = BoolGetDatum(isAgg);			/* proisagg */
 	values[i++] = BoolGetDatum(security_definer); /* prosecdef */
-	values[i++] = BoolGetDatum(false);			/* proimplicit */
 	values[i++] = BoolGetDatum(isStrict);		/* proisstrict */
 	values[i++] = BoolGetDatum(returnsSet);		/* proretset */
 	values[i++] = CharGetDatum(volatility);		/* provolatile */
 	values[i++] = UInt16GetDatum(parameterCount); /* pronargs */
 	values[i++] = ObjectIdGetDatum(returnType);	/* prorettype */
 	values[i++] = PointerGetDatum(typev);		/* proargtypes */
-	values[i++] = Int32GetDatum(byte_pct);		/* probyte_pct */
-	values[i++] = Int32GetDatum(perbyte_cpu);	/* properbyte_cpu */
-	values[i++] = Int32GetDatum(percall_cpu);	/* propercall_cpu */
-	values[i++] = Int32GetDatum(outin_ratio);	/* prooutin_ratio */
 	values[i++] = DirectFunctionCall1(textin,	/* prosrc */
 									  CStringGetDatum(prosrc));
 	values[i++] = DirectFunctionCall1(textin,	/* probin */

--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.75 2002/07/20 05:16:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.76 2002/07/24 19:11:09 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -76,7 +76,6 @@ TypeShellMake(const char *typeName, Oid typeNamespace)
 	values[i++] = ObjectIdGetDatum(typeNamespace); /* typnamespace */
 	values[i++] = ObjectIdGetDatum(InvalidOid); /* typowner */
 	values[i++] = Int16GetDatum(0);		/* typlen */
-	values[i++] = Int16GetDatum(0);		/* typprtlen */
 	values[i++] = BoolGetDatum(false);	/* typbyval */
 	values[i++] = CharGetDatum(0);		/* typtype */
 	values[i++] = BoolGetDatum(false);	/* typisdefined */
@@ -85,8 +84,6 @@ TypeShellMake(const char *typeName, Oid typeNamespace)
 	values[i++] = ObjectIdGetDatum(InvalidOid); /* typelem */
 	values[i++] = ObjectIdGetDatum(InvalidOid); /* typinput */
 	values[i++] = ObjectIdGetDatum(InvalidOid); /* typoutput */
-	values[i++] = ObjectIdGetDatum(InvalidOid); /* typreceive */
-	values[i++] = ObjectIdGetDatum(InvalidOid); /* typsend */
 	values[i++] = CharGetDatum('i');			/* typalign */
 	values[i++] = CharGetDatum('p');			/* typstorage */
 	values[i++] = BoolGetDatum(false);			/* typnotnull */
@@ -141,13 +138,10 @@ TypeCreate(const char *typeName,
 		   Oid assignedTypeOid,
 		   Oid relationOid,			/* only for 'c'atalog typeTypes */
 		   int16 internalSize,
-		   int16 externalSize,
 		   char typeType,
 		   char typDelim,
 		   Oid inputProcedure,
 		   Oid outputProcedure,
-		   Oid receiveProcedure,
-		   Oid sendProcedure,
 		   Oid elementType,
 		   Oid baseType,
 		   const char *defaultTypeValue,	/* human readable rep */
@@ -176,9 +170,6 @@ TypeCreate(const char *typeName,
 	if (!(internalSize > 0 || internalSize == -1))
 		elog(ERROR, "TypeCreate: invalid type internal size %d",
 			 internalSize);
-	if (!(externalSize > 0 || externalSize == -1))
-		elog(ERROR, "TypeCreate: invalid type external size %d",
-			 externalSize);

 	if (internalSize != -1 && storage != 'p')
 		elog(ERROR, "TypeCreate: fixed size types must have storage PLAIN");
@@ -202,7 +193,6 @@ TypeCreate(const char *typeName,
 	values[i++] = ObjectIdGetDatum(typeNamespace);	/* typnamespace */
 	values[i++] = Int32GetDatum(GetUserId());	/* typowner */
 	values[i++] = Int16GetDatum(internalSize);	/* typlen */
-	values[i++] = Int16GetDatum(externalSize);	/* typprtlen */
 	values[i++] = BoolGetDatum(passedByValue);	/* typbyval */
 	values[i++] = CharGetDatum(typeType);		/* typtype */
 	values[i++] = BoolGetDatum(true);			/* typisdefined */
@@ -211,8 +201,6 @@ TypeCreate(const char *typeName,
 	values[i++] = ObjectIdGetDatum(elementType);	/* typelem */
 	values[i++] = ObjectIdGetDatum(inputProcedure);	/* typinput */
 	values[i++] = ObjectIdGetDatum(outputProcedure); /* typoutput */
-	values[i++] = ObjectIdGetDatum(receiveProcedure); /* typreceive */
-	values[i++] = ObjectIdGetDatum(sendProcedure);	/* typsend */
 	values[i++] = CharGetDatum(alignment);		/* typalign */
 	values[i++] = CharGetDatum(storage);		/* typstorage */
 	values[i++] = BoolGetDatum(typeNotNull);		/* typnotnull */
@@ -335,22 +323,6 @@ TypeCreate(const char *typeName,
 		referenced.objectSubId = 0;
 		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);

-		if (receiveProcedure != inputProcedure)
-		{
-			referenced.classId = RelOid_pg_proc;
-			referenced.objectId = receiveProcedure;
-			referenced.objectSubId = 0;
-			recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
-		}
-
-		if (sendProcedure != outputProcedure)
-		{
-			referenced.classId = RelOid_pg_proc;
-			referenced.objectId = sendProcedure;
-			referenced.objectSubId = 0;
-			recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
-		}
-
 		/*
 		 * If the type is a rowtype for a relation, mark it as internally
 		 * dependent on the relation.  This allows it to be auto-dropped

--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -9,7 +9,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.12 2002/07/22 20:23:19 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.13 2002/07/24 19:11:09 petere Exp $
 *
 * DESCRIPTION
 *	  These routines take the parse tree and pick out the
@@ -272,11 +272,7 @@ compute_attributes_sql_style(const List *options,
 *------------
 */
 static void
-compute_attributes_with_style(List *parameters,
-							  int32 *byte_pct_p, int32 *perbyte_cpu_p,
-							  int32 *percall_cpu_p, int32 *outin_ratio_p,
-							  bool *isStrict_p,
-							  char *volatility_p)
+compute_attributes_with_style(List *parameters, bool *isStrict_p, char *volatility_p)
 {
 	List	   *pl;

@@ -286,33 +282,11 @@ compute_attributes_with_style(List *parameters,

 		if (strcasecmp(param->defname, "isstrict") == 0)
 			*isStrict_p = true;
-		else if (strcasecmp(param->defname, "isimmutable") == 0)
-			*volatility_p = PROVOLATILE_IMMUTABLE;
-		else if (strcasecmp(param->defname, "isstable") == 0)
-			*volatility_p = PROVOLATILE_STABLE;
-		else if (strcasecmp(param->defname, "isvolatile") == 0)
-			*volatility_p = PROVOLATILE_VOLATILE;
 		else if (strcasecmp(param->defname, "iscachable") == 0)
 		{
 			/* obsolete spelling of isImmutable */
 			*volatility_p = PROVOLATILE_IMMUTABLE;
 		}
-		else if (strcasecmp(param->defname, "trusted") == 0)
-		{
-			/*
-			 * we don't have untrusted functions any more. The 4.2
-			 * implementation is lousy anyway so I took it out. -ay 10/94
-			 */
-			elog(ERROR, "untrusted function has been decommissioned.");
-		}
-		else if (strcasecmp(param->defname, "byte_pct") == 0)
-			*byte_pct_p = (int) defGetNumeric(param);
-		else if (strcasecmp(param->defname, "perbyte_cpu") == 0)
-			*perbyte_cpu_p = (int) defGetNumeric(param);
-		else if (strcasecmp(param->defname, "percall_cpu") == 0)
-			*percall_cpu_p = (int) defGetNumeric(param);
-		else if (strcasecmp(param->defname, "outin_ratio") == 0)
-			*outin_ratio_p = (int) defGetNumeric(param);
 		else
 			elog(WARNING, "Unrecognized function attribute '%s' ignored",
 				 param->defname);
@@ -383,10 +357,6 @@ CreateFunction(CreateFunctionStmt *stmt)
 	AclResult	aclresult;
 	int			parameterCount;
 	Oid			parameterTypes[FUNC_MAX_ARGS];
-	int32		byte_pct,
-				perbyte_cpu,
-				percall_cpu,
-				outin_ratio;
 	bool		isStrict,
 				security;
 	char		volatility;
@@ -404,10 +374,6 @@ CreateFunction(CreateFunctionStmt *stmt)
 		aclcheck_error(aclresult, get_namespace_name(namespaceId));

 	/* defaults attributes */
-	byte_pct = BYTE_PCT;
-	perbyte_cpu = PERBYTE_CPU;
-	percall_cpu = PERCALL_CPU;
-	outin_ratio = OUTIN_RATIO;
 	isStrict = false;
 	security = false;
 	volatility = PROVOLATILE_VOLATILE;
@@ -459,9 +425,7 @@ CreateFunction(CreateFunctionStmt *stmt)
 	parameterCount = compute_parameter_types(stmt->argTypes, languageOid,
 											 parameterTypes);

-	compute_attributes_with_style(stmt->withClause,
-								  &byte_pct, &perbyte_cpu, &percall_cpu,
-								  &outin_ratio, &isStrict, &volatility);
+	compute_attributes_with_style(stmt->withClause, &isStrict, &volatility);

 	interpret_AS_clause(languageOid, languageName, as_clause,
 						&prosrc_str, &probin_str);
@@ -505,10 +469,6 @@ CreateFunction(CreateFunctionStmt *stmt)
 					security,
 					isStrict,
 					volatility,
-					byte_pct,
-					perbyte_cpu,
-					percall_cpu,
-					outin_ratio,
 					parameterCount,
 					parameterTypes);
 }

--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -9,7 +9,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/operatorcmds.c,v 1.5 2002/07/12 18:43:16 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/operatorcmds.c,v 1.6 2002/07/24 19:11:09 petere Exp $
 *
 * DESCRIPTION
 *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -62,11 +62,8 @@ DefineOperator(List *names, List *parameters)
 	char	   *oprName;
 	Oid			oprNamespace;
 	AclResult	aclresult;
-	uint16		precedence = 0;			/* operator precedence */
 	bool		canHash = false;		/* operator hashes */
 	bool		canMerge = false;		/* operator merges */
-	bool		isLeftAssociative = true;		/* operator is left
-												 * associative */
 	List	   *functionName = NIL;		/* function for operator */
 	TypeName   *typeName1 = NULL;		/* first type name */
 	TypeName   *typeName2 = NULL;		/* second type name */
@@ -113,16 +110,6 @@ DefineOperator(List *names, List *parameters)
 		}
 		else if (strcasecmp(defel->defname, "procedure") == 0)
 			functionName = defGetQualifiedName(defel);
-		else if (strcasecmp(defel->defname, "precedence") == 0)
-		{
-			/* NOT IMPLEMENTED (never worked in v4.2) */
-			elog(NOTICE, "CREATE OPERATOR: precedence not implemented");
-		}
-		else if (strcasecmp(defel->defname, "associativity") == 0)
-		{
-			/* NOT IMPLEMENTED (never worked in v4.2) */
-			elog(NOTICE, "CREATE OPERATOR: associativity not implemented");
-		}
 		else if (strcasecmp(defel->defname, "commutator") == 0)
 			commutatorName = defGetQualifiedName(defel);
 		else if (strcasecmp(defel->defname, "negator") == 0)
@@ -190,8 +177,6 @@ DefineOperator(List *names, List *parameters)
 				   typeId1,		/* left type id */
 				   typeId2,		/* right type id */
 				   functionName,	/* function for operator */
-				   precedence,	/* operator precedence */
-				   isLeftAssociative,	/* operator is left associative */
 				   commutatorName,		/* optional commutator operator
 										 * name */
 				   negatorName, /* optional negator operator name */

--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -7,7 +7,7 @@
 * Portions Copyright (c) 1994, Regents of the University of California
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/proclang.c,v 1.37 2002/07/20 05:16:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/proclang.c,v 1.38 2002/07/24 19:11:09 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -110,8 +110,6 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 	values[i++] = BoolGetDatum(stmt->pltrusted);
 	values[i++] = ObjectIdGetDatum(procOid);
 	values[i++] = ObjectIdGetDatum(valProcOid);
-	values[i++] = DirectFunctionCall1(textin,
-									  CStringGetDatum(stmt->plcompiler));
 	nulls[i] = 'n';				/* lanacl */

 	rel = heap_openr(LanguageRelationName, RowExclusiveLock);

--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.7 2002/07/20 05:16:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.8 2002/07/24 19:11:09 petere Exp $
 *
 * DESCRIPTION
 *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -20,7 +20,7 @@
 * NOTES
 *	  These things must be defined and committed in the following order:
 *		"create function":
- *				input/output, recv/send procedures
+ *				input/output functions
 *		"create type":
 *				type
 *		"create operator":
@@ -62,12 +62,9 @@ DefineType(List *names, List *parameters)
 	Oid			typeNamespace;
 	AclResult	aclresult;
 	int16		internalLength = -1;	/* int2 */
-	int16		externalLength = -1;	/* int2 */
 	Oid			elemType = InvalidOid;
 	List	   *inputName = NIL;
 	List	   *outputName = NIL;
-	List	   *sendName = NIL;
-	List	   *receiveName = NIL;
 	char	   *defaultValue = NULL;
 	bool		byValue = false;
 	char		delimiter = DEFAULT_TYPDELIM;
@@ -75,8 +72,6 @@ DefineType(List *names, List *parameters)
 	char		storage = 'p';	/* default TOAST storage method */
 	Oid			inputOid;
 	Oid			outputOid;
-	Oid			sendOid;
-	Oid			receiveOid;
 	char	   *shadow_type;
 	List	   *pl;
 	Oid			typoid;
@@ -105,15 +100,15 @@ DefineType(List *names, List *parameters)
 		if (strcasecmp(defel->defname, "internallength") == 0)
 			internalLength = defGetTypeLength(defel);
 		else if (strcasecmp(defel->defname, "externallength") == 0)
-			externalLength = defGetTypeLength(defel);
+			; /* ignored -- remove after 7.3 */
 		else if (strcasecmp(defel->defname, "input") == 0)
 			inputName = defGetQualifiedName(defel);
 		else if (strcasecmp(defel->defname, "output") == 0)
 			outputName = defGetQualifiedName(defel);
 		else if (strcasecmp(defel->defname, "send") == 0)
-			sendName = defGetQualifiedName(defel);
+			; /* ignored -- remove after 7.3 */
 		else if (strcasecmp(defel->defname, "receive") == 0)
-			receiveName = defGetQualifiedName(defel);
+			; /* ignored -- remove after 7.3 */
 		else if (strcasecmp(defel->defname, "delimiter") == 0)
 		{
 			char	   *p = defGetString(defel);
@@ -187,14 +182,6 @@ DefineType(List *names, List *parameters)
 	/* Convert I/O proc names to OIDs */
 	inputOid = findTypeIOFunction(inputName, false);
 	outputOid = findTypeIOFunction(outputName, true);
-	if (sendName)
-		sendOid = findTypeIOFunction(sendName, true);
-	else
-		sendOid = outputOid;
-	if (receiveName)
-		receiveOid = findTypeIOFunction(receiveName, false);
-	else
-		receiveOid = inputOid;

 	/*
 	 * now have TypeCreate do all the real work.
@@ -205,13 +192,10 @@ DefineType(List *names, List *parameters)
 				   InvalidOid,		/* preassigned type oid (not done here) */
 				   InvalidOid,		/* relation oid (n/a here) */
 				   internalLength,	/* internal size */
-				   externalLength,	/* external size */
 				   'b',				/* type-type (base type) */
 				   delimiter,		/* array element delimiter */
 				   inputOid,		/* input procedure */
 				   outputOid,		/* output procedure */
-				   receiveOid,		/* receive procedure */
-				   sendOid,			/* send procedure */
 				   elemType,		/* element type ID */
 				   InvalidOid,		/* base type ID (only for domains) */
 				   defaultValue,	/* default type value */
@@ -237,13 +221,10 @@ DefineType(List *names, List *parameters)
 			   InvalidOid,		/* preassigned type oid (not done here) */
 			   InvalidOid,		/* relation oid (n/a here) */
 			   -1,				/* internal size */
-			   -1,				/* external size */
 			   'b',				/* type-type (base type) */
 			   DEFAULT_TYPDELIM,	/* array element delimiter */
 			   F_ARRAY_IN,		/* input procedure */
 			   F_ARRAY_OUT,		/* output procedure */
-			   F_ARRAY_IN,		/* receive procedure */
-			   F_ARRAY_OUT,		/* send procedure */
 			   typoid,			/* element type ID */
 			   InvalidOid,		/* base type ID */
 			   NULL,			/* never a default type value */
@@ -346,11 +327,8 @@ DefineDomain(CreateDomainStmt *stmt)
 	Oid			domainNamespace;
 	AclResult	aclresult;
 	int16		internalLength;
-	int16		externalLength;
 	Oid			inputProcedure;
 	Oid			outputProcedure;
-	Oid			receiveProcedure;
-	Oid			sendProcedure;
 	bool		byValue;
 	char		delimiter;
 	char		alignment;
@@ -421,17 +399,12 @@ DefineDomain(CreateDomainStmt *stmt)
 	/* Storage Length */
 	internalLength = baseType->typlen;

-	/* External Length (unused) */
-	externalLength = baseType->typprtlen;
-
 	/* Array element Delimiter */
 	delimiter = baseType->typdelim;

 	/* I/O Functions */
 	inputProcedure = baseType->typinput;
 	outputProcedure = baseType->typoutput;
-	receiveProcedure = baseType->typreceive;
-	sendProcedure = baseType->typsend;

 	/* Inherited default value */
 	datum =	SysCacheGetAttr(TYPEOID, typeTup,
@@ -549,13 +522,10 @@ DefineDomain(CreateDomainStmt *stmt)
 				   InvalidOid,			/* preassigned type oid (none here) */
 				   InvalidOid,			/* relation oid (n/a here) */
 				   internalLength,		/* internal size */
-				   externalLength,		/* external size */
 				   'd',					/* type-type (domain type) */
 				   delimiter,			/* array element delimiter */
 				   inputProcedure,		/* input procedure */
 				   outputProcedure,		/* output procedure */
-				   receiveProcedure,	/* receive procedure */
-				   sendProcedure,		/* send procedure */
 				   basetypelem,			/* element type ID */
 				   basetypeoid,			/* base type ID */
 				   defaultValue,		/* default type value (text) */

--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.105 2002/06/20 20:29:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.106 2002/07/24 19:11:09 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -560,7 +560,6 @@ CreateUser(CreateUserStmt *stmt)
 	new_record[Anum_pg_shadow_usesysid - 1] = Int32GetDatum(sysid);
 	AssertState(BoolIsValid(createdb));
 	new_record[Anum_pg_shadow_usecreatedb - 1] = BoolGetDatum(createdb);
-	new_record[Anum_pg_shadow_usetrace - 1] = BoolGetDatum(false);
 	AssertState(BoolIsValid(createuser));
 	new_record[Anum_pg_shadow_usesuper - 1] = BoolGetDatum(createuser);
 	/* superuser gets catupd right by default */

--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -15,7 +15,7 @@
 * Portions Copyright (c) 1994, Regents of the University of California
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.196 2002/07/18 17:14:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.197 2002/07/24 19:11:10 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -2415,8 +2415,6 @@ _copyCreatePLangStmt(CreatePLangStmt *from)
 		newnode->plname = pstrdup(from->plname);
 	Node_Copy(from, newnode, plhandler);
 	Node_Copy(from, newnode, plvalidator);
-	if (from->plcompiler)
-		newnode->plcompiler = pstrdup(from->plcompiler);
 	newnode->pltrusted = from->pltrusted;

 	return newnode;

--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -20,7 +20,7 @@
 * Portions Copyright (c) 1994, Regents of the University of California
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.143 2002/07/18 17:14:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.144 2002/07/24 19:11:10 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -1252,8 +1252,6 @@ _equalCreatePLangStmt(CreatePLangStmt *a, CreatePLangStmt *b)
 		return false;
 	if (!equal(a->plvalidator, b->plvalidator))
 		return false;
-	if (!equalstr(a->plcompiler, b->plcompiler))
-		return false;
 	if (a->pltrusted != b->pltrusted)
 		return false;


--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.348 2002/07/20 05:58:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.349 2002/07/24 19:11:10 petere Exp $
 *
 * HISTORY
 *	  AUTHOR			DATE			MAJOR EVENT
@@ -1931,7 +1931,6 @@ CreatePLangStmt:
 				n->plname = $5;
 				n->plhandler = $7;
 				n->plvalidator = $8;
-				n->plcompiler = $9;
 				n->pltrusted = $2;
 				$$ = (Node *)n;
 			}

--- a/src/backend/utils/Gen_fmgrtab.sh
+++ b/src/backend/utils/Gen_fmgrtab.sh
@@ -9,7 +9,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.24 2002/06/20 20:29:36 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.25 2002/07/24 19:11:10 petere Exp $
 #
 #-------------------------------------------------------------------------

@@ -233,15 +233,15 @@ FuNkYfMgRtAbStUfF
 # may seem tedious, but avoid the temptation to write a quick x?y:z
 # conditional expression instead.  Not all awks have conditional expressions.
 #
-# Note assumptions here that prosrc == $(NF-2), pronargs == $12,
-# proisstrict == $9, proretset == $10
+# Note assumptions here that prosrc == $(NF-2), pronargs == $11,
+# proisstrict == $8, proretset == $9

 $AWK 'BEGIN {
    Bool["t"] = "true"
    Bool["f"] = "false"
 }
 { printf ("  { %d, \"%s\", %d, %s, %s, %s },\n"), \
-	$1, $(NF-2), $12, Bool[$9], Bool[$10], $(NF-2)
+	$1, $(NF-2), $11, Bool[$8], Bool[$9], $(NF-2)
 }' $RAWFILE >> "$$-$TABLEFILE"

 if [ $? -ne 0 ]; then

--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -10,7 +10,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.48 2002/07/20 05:16:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.49 2002/07/24 19:11:11 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -65,10 +65,6 @@ SetDefine(char *querystr, Oid elemType)
 							 false,		/* security invoker */
 							 false,		/* isStrict (irrelevant, no args) */
 							 PROVOLATILE_VOLATILE,	/* assume unsafe */
-							 100,		/* byte_pct */
-							 0, /* perbyte_cpu */
-							 0, /* percall_cpu */
-							 100,		/* outin_ratio */
 							 0,			/* parameterCount */
 							 NULL);		/* parameterTypes */


--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -27,7 +27,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.161 2002/07/18 23:11:29 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.162 2002/07/24 19:11:11 petere Exp $
 #
 #-------------------------------------------------------------------------

@@ -737,7 +737,6 @@ CREATE VIEW pg_user AS \
        usename, \
        usesysid, \
        usecreatedb, \
-        usetrace, \
        usesuper, \
        usecatupd, \
        '********'::text as passwd, \

--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.274 2002/07/18 23:11:29 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.275 2002/07/24 19:11:11 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -2781,15 +2781,10 @@ dumpOneBaseType(Archive *fout, TypeInfo *tinfo,
 	int			ntups;
 	int			funcInd;
 	char	   *typlen;
-	char	   *typprtlen;
 	char	   *typinput;
 	char	   *typoutput;
-	char	   *typreceive;
-	char	   *typsend;
 	char	   *typinputoid;
 	char	   *typoutputoid;
-	char	   *typreceiveoid;
-	char	   *typsendoid;
 	char	   *typdelim;
 	char	   *typdefault;
 	char	   *typbyval;
@@ -2806,12 +2801,10 @@ dumpOneBaseType(Archive *fout, TypeInfo *tinfo,
 	/* Fetch type-specific details */
 	if (fout->remoteVersion >= 70300)
 	{
-		appendPQExpBuffer(query, "SELECT typlen, typprtlen, "
-						  "typinput, typoutput, typreceive, typsend, "
+		appendPQExpBuffer(query, "SELECT typlen, "
+						  "typinput, typoutput, "
 						  "typinput::pg_catalog.oid as typinputoid, "
 						  "typoutput::pg_catalog.oid as typoutputoid, "
-						  "typreceive::pg_catalog.oid as typreceiveoid, "
-						  "typsend::pg_catalog.oid as typsendoid, "
 						  "typdelim, typdefault, typbyval, typalign, "
 						  "typstorage "
 						  "FROM pg_catalog.pg_type "
@@ -2820,12 +2813,10 @@ dumpOneBaseType(Archive *fout, TypeInfo *tinfo,
 	}
 	else if (fout->remoteVersion >= 70100)
 	{
-		appendPQExpBuffer(query, "SELECT typlen, typprtlen, "
-						  "typinput, typoutput, typreceive, typsend, "
+		appendPQExpBuffer(query, "SELECT typlen, "
+						  "typinput, typoutput, "
 						  "typinput::oid as typinputoid, "
 						  "typoutput::oid as typoutputoid, "
-						  "typreceive::oid as typreceiveoid, "
-						  "typsend::oid as typsendoid, "
 						  "typdelim, typdefault, typbyval, typalign, "
 						  "typstorage "
 						  "FROM pg_type "
@@ -2834,12 +2825,10 @@ dumpOneBaseType(Archive *fout, TypeInfo *tinfo,
 	}
 	else
 	{
-		appendPQExpBuffer(query, "SELECT typlen, typprtlen, "
-						  "typinput, typoutput, typreceive, typsend, "
+		appendPQExpBuffer(query, "SELECT typlen, "
+						  "typinput, typoutput, "
 						  "typinput::oid as typinputoid, "
 						  "typoutput::oid as typoutputoid, "
-						  "typreceive::oid as typreceiveoid, "
-						  "typsend::oid as typsendoid, "
 						  "typdelim, typdefault, typbyval, typalign, "
 						  "'p'::char as typstorage "
 						  "FROM pg_type "
@@ -2866,15 +2855,10 @@ dumpOneBaseType(Archive *fout, TypeInfo *tinfo,
 	}

 	typlen = PQgetvalue(res, 0, PQfnumber(res, "typlen"));
-	typprtlen = PQgetvalue(res, 0, PQfnumber(res, "typprtlen"));
 	typinput = PQgetvalue(res, 0, PQfnumber(res, "typinput"));
 	typoutput = PQgetvalue(res, 0, PQfnumber(res, "typoutput"));
-	typreceive = PQgetvalue(res, 0, PQfnumber(res, "typreceive"));
-	typsend = PQgetvalue(res, 0, PQfnumber(res, "typsend"));
 	typinputoid = PQgetvalue(res, 0, PQfnumber(res, "typinputoid"));
 	typoutputoid = PQgetvalue(res, 0, PQfnumber(res, "typoutputoid"));
-	typreceiveoid = PQgetvalue(res, 0, PQfnumber(res, "typreceiveoid"));
-	typsendoid = PQgetvalue(res, 0, PQfnumber(res, "typsendoid"));
 	typdelim = PQgetvalue(res, 0, PQfnumber(res, "typdelim"));
 	if (PQgetisnull(res, 0, PQfnumber(res, "typdefault")))
 		typdefault = NULL;
@@ -2898,20 +2882,6 @@ dumpOneBaseType(Archive *fout, TypeInfo *tinfo,
 	if (funcInd >= 0 && g_finfo[funcInd].pronamespace->dump)
 		(*deps)[depIdx++] = strdup(typoutputoid);

-	if (strcmp(typreceiveoid, typinputoid) != 0)
-	{
-		funcInd = findFuncByOid(g_finfo, numFuncs, typreceiveoid);
-		if (funcInd >= 0 && g_finfo[funcInd].pronamespace->dump)
-			(*deps)[depIdx++] = strdup(typreceiveoid);
-	}
-
-	if (strcmp(typsendoid, typoutputoid) != 0)
-	{
-		funcInd = findFuncByOid(g_finfo, numFuncs, typsendoid);
-		if (funcInd >= 0 && g_finfo[funcInd].pronamespace->dump)
-			(*deps)[depIdx++] = strdup(typsendoid);
-	}
-
 	/* DROP must be fully qualified in case same name appears in pg_catalog */
 	appendPQExpBuffer(delq, "DROP TYPE %s.",
 					  fmtId(tinfo->typnamespace->nspname, force_quotes));
@@ -2920,17 +2890,15 @@ dumpOneBaseType(Archive *fout, TypeInfo *tinfo,

 	appendPQExpBuffer(q,
 					  "CREATE TYPE %s "
-					  "( internallength = %s, externallength = %s,",
+					  "( internallength = %s,",
 					  fmtId(tinfo->typname, force_quotes),
-					  (strcmp(typlen, "-1") == 0) ? "variable" : typlen,
-					  (strcmp(typprtlen, "-1") == 0) ? "variable" : typprtlen);
+					  (strcmp(typlen, "-1") == 0) ? "variable" : typlen);

 	if (fout->remoteVersion >= 70300)
 	{
 		/* regproc result is correctly quoted in 7.3 */
-		appendPQExpBuffer(q, " input = %s, output = %s, "
-						  "send = %s, receive = %s",
-						  typinput, typoutput, typsend, typreceive);
+		appendPQExpBuffer(q, " input = %s, output = %s, ",
+						  typinput, typoutput);
 	}
 	else
 	{
@@ -2940,10 +2908,6 @@ dumpOneBaseType(Archive *fout, TypeInfo *tinfo,
 						  fmtId(typinput, force_quotes));
 		appendPQExpBuffer(q, " output = %s,",
 						  fmtId(typoutput, force_quotes));
-		appendPQExpBuffer(q, " send = %s,",
-						  fmtId(typsend, force_quotes));
-		appendPQExpBuffer(q, " receive = %s",
-						  fmtId(typreceive, force_quotes));
 	}

 	if (typdefault != NULL)
@@ -3167,11 +3131,9 @@ dumpProcLangs(Archive *fout, FuncInfo finfo[], int numFuncs)
 	int			i_lanpltrusted;
 	int			i_lanplcallfoid;
 	int			i_lanvalidator = -1;
-	int			i_lancompiler;
 	int			i_lanacl = -1;
 	char	   *lanoid;
 	char	   *lanname;
-	char	   *lancompiler;
 	char	   *lanacl;
 	const char *lanplcallfoid;
 	const char *lanvalidator;
@@ -3200,7 +3162,6 @@ dumpProcLangs(Archive *fout, FuncInfo finfo[], int numFuncs)
 	i_lanname = PQfnumber(res, "lanname");
 	i_lanpltrusted = PQfnumber(res, "lanpltrusted");
 	i_lanplcallfoid = PQfnumber(res, "lanplcallfoid");
-	i_lancompiler = PQfnumber(res, "lancompiler");
 	i_oid = PQfnumber(res, "oid");
 	if (fout->remoteVersion >= 70300)
 	{
@@ -3213,7 +3174,6 @@ dumpProcLangs(Archive *fout, FuncInfo finfo[], int numFuncs)
 		lanoid = PQgetvalue(res, i, i_oid);
 		lanplcallfoid = PQgetvalue(res, i, i_lanplcallfoid);
 		lanname = PQgetvalue(res, i, i_lanname);
-		lancompiler = PQgetvalue(res, i, i_lancompiler);
 		if (fout->remoteVersion >= 70300)
 		{
 			lanvalidator = PQgetvalue(res, i, i_lanvalidator);

--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: catversion.h,v 1.141 2002/07/18 23:11:30 petere Exp $
+ * $Id: catversion.h,v 1.142 2002/07/24 19:11:12 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -53,6 +53,6 @@
 */

 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200207191
+#define CATALOG_VERSION_NO	200207241

 #endif
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -8,7 +8,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: pg_attribute.h,v 1.93 2002/06/20 20:29:44 momjian Exp $
+ * $Id: pg_attribute.h,v 1.94 2002/07/24 19:11:12 petere Exp $
 *
 * NOTES
 *	  the genbki.sh script reads this file and generates .bki
@@ -214,50 +214,44 @@ typedef FormData_pg_attribute *Form_pg_attribute;
 { 1247, {"typnamespace"},  26, 0,	4,	2, 0, -1, -1, true, 'p', false, 'i', false, false }, \
 { 1247, {"typowner"},	   23, 0,	4,	3, 0, -1, -1, true, 'p', false, 'i', false, false }, \
 { 1247, {"typlen"},		   21, 0,	2,	4, 0, -1, -1, true, 'p', false, 's', false, false }, \
-{ 1247, {"typprtlen"},	   21, 0,	2,	5, 0, -1, -1, true, 'p', false, 's', false, false }, \
-{ 1247, {"typbyval"},	   16, 0,	1,	6, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1247, {"typtype"},	   18, 0,	1,	7, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1247, {"typisdefined"},  16, 0,	1,	8, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1247, {"typdelim"},	   18, 0,	1,	9, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1247, {"typrelid"},	   26, 0,	4, 10, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1247, {"typelem"},	   26, 0,	4, 11, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1247, {"typinput"},	   24, 0,	4, 12, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1247, {"typoutput"},	   24, 0,	4, 13, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1247, {"typreceive"},    24, 0,	4, 14, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1247, {"typsend"},	   24, 0,	4, 15, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1247, {"typalign"},	   18, 0,	1, 16, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1247, {"typstorage"},    18, 0,	1, 17, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1247, {"typnotnull"},    16, 0,   1, 18, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1247, {"typbasetype"},   26, 0,	4, 19, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1247, {"typtypmod"},     23, 0,	4, 20, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1247, {"typndims"},      23, 0,	4, 21, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1247, {"typdefaultbin"}, 25, 0,  -1, 22, 0, -1, -1, false, 'x', false, 'i', false, false }, \
-{ 1247, {"typdefault"},    25, 0,  -1, 23, 0, -1, -1, false, 'x', false, 'i', false, false }
+{ 1247, {"typbyval"},	   16, 0,	1,	5, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1247, {"typtype"},	   18, 0,	1,	6, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1247, {"typisdefined"},  16, 0,	1,	7, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1247, {"typdelim"},	   18, 0,	1,	8, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1247, {"typrelid"},	   26, 0,	4,	9, 0, -1, -1, true, 'p', false, 'i', false, false }, \
+{ 1247, {"typelem"},	   26, 0,	4, 10, 0, -1, -1, true, 'p', false, 'i', false, false }, \
+{ 1247, {"typinput"},	   24, 0,	4, 11, 0, -1, -1, true, 'p', false, 'i', false, false }, \
+{ 1247, {"typoutput"},	   24, 0,	4, 12, 0, -1, -1, true, 'p', false, 'i', false, false }, \
+{ 1247, {"typalign"},	   18, 0,	1, 13, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1247, {"typstorage"},    18, 0,	1, 14, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1247, {"typnotnull"},    16, 0,   1, 15, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1247, {"typbasetype"},   26, 0,	4, 16, 0, -1, -1, true, 'p', false, 'i', false, false }, \
+{ 1247, {"typtypmod"},     23, 0,	4, 17, 0, -1, -1, true, 'p', false, 'i', false, false }, \
+{ 1247, {"typndims"},      23, 0,	4, 18, 0, -1, -1, true, 'p', false, 'i', false, false }, \
+{ 1247, {"typdefaultbin"}, 25, 0,  -1, 19, 0, -1, -1, false, 'x', false, 'i', false, false }, \
+{ 1247, {"typdefault"},    25, 0,  -1, 20, 0, -1, -1, false, 'x', false, 'i', false, false }


 DATA(insert ( 1247 typname			19 DEFAULT_ATTSTATTARGET NAMEDATALEN   1 0 -1 -1 f p f i f f));
 DATA(insert ( 1247 typnamespace		26 0  4   2 0 -1 -1 t p f i f f));
 DATA(insert ( 1247 typowner			23 0  4   3 0 -1 -1 t p f i f f));
 DATA(insert ( 1247 typlen			21 0  2   4 0 -1 -1 t p f s f f));
-DATA(insert ( 1247 typprtlen		21 0  2   5 0 -1 -1 t p f s f f));
-DATA(insert ( 1247 typbyval			16 0  1   6 0 -1 -1 t p f c f f));
-DATA(insert ( 1247 typtype			18 0  1   7 0 -1 -1 t p f c f f));
-DATA(insert ( 1247 typisdefined		16 0  1   8 0 -1 -1 t p f c f f));
-DATA(insert ( 1247 typdelim			18 0  1   9 0 -1 -1 t p f c f f));
-DATA(insert ( 1247 typrelid			26 0  4  10 0 -1 -1 t p f i f f));
-DATA(insert ( 1247 typelem			26 0  4  11 0 -1 -1 t p f i f f));
-DATA(insert ( 1247 typinput			24 0  4  12 0 -1 -1 t p f i f f));
-DATA(insert ( 1247 typoutput		24 0  4  13 0 -1 -1 t p f i f f));
-DATA(insert ( 1247 typreceive		24 0  4  14 0 -1 -1 t p f i f f));
-DATA(insert ( 1247 typsend			24 0  4  15 0 -1 -1 t p f i f f));
-DATA(insert ( 1247 typalign			18 0  1  16 0 -1 -1 t p f c f f));
-DATA(insert ( 1247 typstorage		18 0  1  17 0 -1 -1 t p f c f f));
-DATA(insert ( 1247 typnotnull		16 0  1  18 0 -1 -1 t p f c f f));
-DATA(insert ( 1247 typbasetype		26 0  4  19 0 -1 -1 t p f i f f));
-DATA(insert ( 1247 typtypmod		23 0  4  20 0 -1 -1 t p f i f f));
-DATA(insert ( 1247 typndims			23 0  4  21 0 -1 -1 t p f i f f));
-DATA(insert ( 1247 typdefaultbin	25 0 -1  22 0 -1 -1 f x f i f f));
-DATA(insert ( 1247 typdefault		25 0 -1  23 0 -1 -1 f x f i f f));
+DATA(insert ( 1247 typbyval			16 0  1   5 0 -1 -1 t p f c f f));
+DATA(insert ( 1247 typtype			18 0  1   6 0 -1 -1 t p f c f f));
+DATA(insert ( 1247 typisdefined		16 0  1   7 0 -1 -1 t p f c f f));
+DATA(insert ( 1247 typdelim			18 0  1   8 0 -1 -1 t p f c f f));
+DATA(insert ( 1247 typrelid			26 0  4   9 0 -1 -1 t p f i f f));
+DATA(insert ( 1247 typelem			26 0  4  10 0 -1 -1 t p f i f f));
+DATA(insert ( 1247 typinput			24 0  4  11 0 -1 -1 t p f i f f));
+DATA(insert ( 1247 typoutput		24 0  4  12 0 -1 -1 t p f i f f));
+DATA(insert ( 1247 typalign			18 0  1  13 0 -1 -1 t p f c f f));
+DATA(insert ( 1247 typstorage		18 0  1  14 0 -1 -1 t p f c f f));
+DATA(insert ( 1247 typnotnull		16 0  1  15 0 -1 -1 t p f c f f));
+DATA(insert ( 1247 typbasetype		26 0  4  16 0 -1 -1 t p f i f f));
+DATA(insert ( 1247 typtypmod		23 0  4  17 0 -1 -1 t p f i f f));
+DATA(insert ( 1247 typndims			23 0  4  18 0 -1 -1 t p f i f f));
+DATA(insert ( 1247 typdefaultbin	25 0 -1  19 0 -1 -1 f x f i f f));
+DATA(insert ( 1247 typdefault		25 0 -1  20 0 -1 -1 f x f i f f));
 DATA(insert ( 1247 ctid				27 0  6  -1 0 -1 -1 f p f i f f));
 DATA(insert ( 1247 oid				26 0  4  -2 0 -1 -1 t p f i f f));
 DATA(insert ( 1247 xmin				28 0  4  -3 0 -1 -1 t p f i f f));
@@ -301,20 +295,15 @@ DATA(insert ( 1262 tableoid			26 0  4  -7 0 -1 -1 t p f i f f));
 { 1255, {"prolang"},			26, 0,	4,	4, 0, -1, -1, true, 'p', false, 'i', false, false }, \
 { 1255, {"proisagg"},			16, 0,	1,	5, 0, -1, -1, true, 'p', false, 'c', false, false }, \
 { 1255, {"prosecdef"},			16, 0,	1,	6, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1255, {"proimplicit"},		16, 0,	1,	7, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1255, {"proisstrict"},		16, 0,	1,	8, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1255, {"proretset"},			16, 0,	1,  9, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1255, {"provolatile"},		18, 0,	1, 10, 0, -1, -1, true, 'p', false, 'c', false, false }, \
-{ 1255, {"pronargs"},			21, 0,	2, 11, 0, -1, -1, true, 'p', false, 's', false, false }, \
-{ 1255, {"prorettype"},			26, 0,	4, 12, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1255, {"proargtypes"},		30, 0, INDEX_MAX_KEYS*4, 13, 0, -1, -1, false, 'p', false, 'i', false, false }, \
-{ 1255, {"probyte_pct"},		23, 0,	4, 14, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1255, {"properbyte_cpu"},		23, 0,	4, 15, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1255, {"propercall_cpu"},		23, 0,	4, 16, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1255, {"prooutin_ratio"},		23, 0,	4, 17, 0, -1, -1, true, 'p', false, 'i', false, false }, \
-{ 1255, {"prosrc"},				25, 0, -1, 18, 0, -1, -1, false, 'x', false, 'i', false, false }, \
-{ 1255, {"probin"},				17, 0, -1, 19, 0, -1, -1, false, 'x', false, 'i', false, false }, \
-{ 1255, {"proacl"},			  1034, 0, -1, 20, 0, -1, -1, false, 'x', false, 'i', false, false }
+{ 1255, {"proisstrict"},		16, 0,	1,	7, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1255, {"proretset"},			16, 0,	1,  8, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1255, {"provolatile"},		18, 0,	1,  9, 0, -1, -1, true, 'p', false, 'c', false, false }, \
+{ 1255, {"pronargs"},			21, 0,	2, 10, 0, -1, -1, true, 'p', false, 's', false, false }, \
+{ 1255, {"prorettype"},			26, 0,	4, 11, 0, -1, -1, true, 'p', false, 'i', false, false }, \
+{ 1255, {"proargtypes"},		30, 0, INDEX_MAX_KEYS*4, 12, 0, -1, -1, false, 'p', false, 'i', false, false }, \
+{ 1255, {"prosrc"},				25, 0, -1, 13, 0, -1, -1, false, 'x', false, 'i', false, false }, \
+{ 1255, {"probin"},				17, 0, -1, 14, 0, -1, -1, false, 'x', false, 'i', false, false }, \
+{ 1255, {"proacl"},			  1034, 0, -1, 15, 0, -1, -1, false, 'x', false, 'i', false, false }

 DATA(insert ( 1255 proname			19 DEFAULT_ATTSTATTARGET NAMEDATALEN   1 0 -1 -1 f p f i f f));
 DATA(insert ( 1255 pronamespace		26 0  4   2 0 -1 -1 t p f i f f));
@@ -322,20 +311,15 @@ DATA(insert ( 1255 proowner			23 0  4   3 0 -1 -1 t p f i f f));
 DATA(insert ( 1255 prolang			26 0  4   4 0 -1 -1 t p f i f f));
 DATA(insert ( 1255 proisagg			16 0  1   5 0 -1 -1 t p f c f f));
 DATA(insert ( 1255 prosecdef		16 0  1   6 0 -1 -1 t p f c f f));
-DATA(insert ( 1255 proimplicit		16 0  1   7 0 -1 -1 t p f c f f));
-DATA(insert ( 1255 proisstrict		16 0  1   8 0 -1 -1 t p f c f f));
-DATA(insert ( 1255 proretset		16 0  1   9 0 -1 -1 t p f c f f));
-DATA(insert ( 1255 provolatile		18 0  1  10 0 -1 -1 t p f c f f));
-DATA(insert ( 1255 pronargs			21 0  2  11 0 -1 -1 t p f s f f));
-DATA(insert ( 1255 prorettype		26 0  4  12 0 -1 -1 t p f i f f));
-DATA(insert ( 1255 proargtypes		30 0 INDEX_MAX_KEYS*4 13 0 -1 -1 f p f i f f));
-DATA(insert ( 1255 probyte_pct		23 0  4  14 0 -1 -1 t p f i f f));
-DATA(insert ( 1255 properbyte_cpu	23 0  4  15 0 -1 -1 t p f i f f));
-DATA(insert ( 1255 propercall_cpu	23 0  4  16 0 -1 -1 t p f i f f));
-DATA(insert ( 1255 prooutin_ratio	23 0  4  17 0 -1 -1 t p f i f f));
-DATA(insert ( 1255 prosrc			25 0 -1  18 0 -1 -1 f x f i f f));
-DATA(insert ( 1255 probin			17 0 -1  19 0 -1 -1 f x f i f f));
-DATA(insert ( 1255 proacl		  1034 0 -1  20 0 -1 -1 f x f i f f));
+DATA(insert ( 1255 proisstrict		16 0  1   7 0 -1 -1 t p f c f f));
+DATA(insert ( 1255 proretset		16 0  1   8 0 -1 -1 t p f c f f));
+DATA(insert ( 1255 provolatile		18 0  1   9 0 -1 -1 t p f c f f));
+DATA(insert ( 1255 pronargs			21 0  2  10 0 -1 -1 t p f s f f));
+DATA(insert ( 1255 prorettype		26 0  4  11 0 -1 -1 t p f i f f));
+DATA(insert ( 1255 proargtypes		30 0 INDEX_MAX_KEYS*4 12 0 -1 -1 f p f i f f));
+DATA(insert ( 1255 prosrc			25 0 -1  13 0 -1 -1 f x f i f f));
+DATA(insert ( 1255 probin			17 0 -1  14 0 -1 -1 f x f i f f));
+DATA(insert ( 1255 proacl		  1034 0 -1  15 0 -1 -1 f x f i f f));
 DATA(insert ( 1255 ctid				27 0  6  -1 0 -1 -1 f p f i f f));
 DATA(insert ( 1255 oid				26 0  4  -2 0 -1 -1 t p f i f f));
 DATA(insert ( 1255 xmin				28 0  4  -3 0 -1 -1 t p f i f f));
@@ -351,12 +335,11 @@ DATA(insert ( 1255 tableoid			26 0  4  -7 0 -1 -1 t p f i f f));
 DATA(insert ( 1260 usename			19	DEFAULT_ATTSTATTARGET NAMEDATALEN	1 0 -1 -1 f p f i f f));
 DATA(insert ( 1260 usesysid			23	DEFAULT_ATTSTATTARGET	4	2 0 -1 -1 t p f i f f));
 DATA(insert ( 1260 usecreatedb		16	0	1	3 0 -1 -1 t p f c f f));
-DATA(insert ( 1260 usetrace			16	0	1	4 0 -1 -1 t p f c f f));
-DATA(insert ( 1260 usesuper			16	0	1	5 0 -1 -1 t p f c f f));
-DATA(insert ( 1260 usecatupd		16	0	1	6 0 -1 -1 t p f c f f));
-DATA(insert ( 1260 passwd			25	0  -1	7 0 -1 -1 f x f i f f));
-DATA(insert ( 1260 valuntil			702 0	4	8 0 -1 -1 t p f i f f));
-DATA(insert ( 1260 useconfig	  1009  0  -1   9 0 -1 -1 f x f i f f));
+DATA(insert ( 1260 usesuper			16	0	1	4 0 -1 -1 t p f c f f));
+DATA(insert ( 1260 usecatupd		16	0	1	5 0 -1 -1 t p f c f f));
+DATA(insert ( 1260 passwd			25	0  -1	6 0 -1 -1 f x f i f f));
+DATA(insert ( 1260 valuntil			702 0	4	7 0 -1 -1 t p f i f f));
+DATA(insert ( 1260 useconfig	  1009  0  -1   8 0 -1 -1 f x f i f f));
 DATA(insert ( 1260 ctid				27 0  6  -1 0 -1 -1 f p f i f f));
 /* no OIDs in pg_shadow */
 DATA(insert ( 1260 xmin				28 0  4  -3 0 -1 -1 t p f i f f));

--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -8,7 +8,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: pg_class.h,v 1.68 2002/06/20 20:29:44 momjian Exp $
+ * $Id: pg_class.h,v 1.69 2002/07/24 19:11:12 petere Exp $
 *
 * NOTES
 *	  the genbki.sh script reads this file and generates .bki
@@ -134,15 +134,15 @@ typedef FormData_pg_class *Form_pg_class;
 * ----------------
 */

-DATA(insert OID = 1247 (  pg_type		PGNSP 71 PGUID 0 1247 0 0 0 0 f f r 23 0 0 0 0 0 t f f f _null_ ));
+DATA(insert OID = 1247 (  pg_type		PGNSP 71 PGUID 0 1247 0 0 0 0 f f r 20 0 0 0 0 0 t f f f _null_ ));
 DESCR("");
 DATA(insert OID = 1249 (  pg_attribute	PGNSP 75 PGUID 0 1249 0 0 0 0 f f r 15 0 0 0 0 0 f f f f _null_ ));
 DESCR("");
-DATA(insert OID = 1255 (  pg_proc		PGNSP 81 PGUID 0 1255 0 0 0 0 f f r 20 0 0 0 0 0 t f f f _null_ ));
+DATA(insert OID = 1255 (  pg_proc		PGNSP 81 PGUID 0 1255 0 0 0 0 f f r 15 0 0 0 0 0 t f f f _null_ ));
 DESCR("");
 DATA(insert OID = 1259 (  pg_class		PGNSP 83 PGUID 0 1259 0 0 0 0 f f r 24 0 0 0 0 0 t f f f _null_ ));
 DESCR("");
-DATA(insert OID = 1260 (  pg_shadow		PGNSP 86 PGUID 0 1260 0 0 0 0 f t r 9  0 0 0 0 0 f f f f _null_ ));
+DATA(insert OID = 1260 (  pg_shadow		PGNSP 86 PGUID 0 1260 0 0 0 0 f t r 8  0 0 0 0 0 f f f f _null_ ));
 DESCR("");
 DATA(insert OID = 1261 (  pg_group		PGNSP 87 PGUID 0 1261 0 0 0 0 f t r 3  0 0 0 0 0 f f f f _null_ ));
 DESCR("");

--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -8,7 +8,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: pg_language.h,v 1.18 2002/06/20 20:29:44 momjian Exp $
+ * $Id: pg_language.h,v 1.19 2002/07/24 19:11:12 petere Exp $
 *
 * NOTES
 *	  the genbki.sh script reads this file and generates .bki
@@ -38,7 +38,6 @@ CATALOG(pg_language)
 	bool		lanpltrusted;	/* PL is trusted */
 	Oid			lanplcallfoid;	/* Call handler for PL */
 	Oid			lanvalidator;	/* optional validation function */
-	text		lancompiler;	/* VARIABLE LENGTH FIELD */
    aclitem		lanacl[1];		/* Access privileges */
 } FormData_pg_language;

@@ -53,27 +52,26 @@ typedef FormData_pg_language *Form_pg_language;
 *		compiler constants for pg_language
 * ----------------
 */
-#define Natts_pg_language				7
+#define Natts_pg_language				6
 #define Anum_pg_language_lanname		1
 #define Anum_pg_language_lanispl		2
 #define Anum_pg_language_lanpltrusted		3
 #define Anum_pg_language_lanplcallfoid		4
 #define Anum_pg_language_lanvalidator		5
-#define Anum_pg_language_lancompiler		6
-#define Anum_pg_language_lanacl			7
+#define Anum_pg_language_lanacl			6

 /* ----------------
 *		initial contents of pg_language
 * ----------------
 */

-DATA(insert OID = 12 ( "internal" f f 0 2246 "n/a" _null_ ));
+DATA(insert OID = 12 ( "internal" f f 0 2246 _null_ ));
 DESCR("Built-in functions");
 #define INTERNALlanguageId 12
-DATA(insert OID = 13 ( "c" f f 0 2247 "/bin/cc" _null_ ));
+DATA(insert OID = 13 ( "c" f f 0 2247 _null_ ));
 DESCR("Dynamically-loaded C functions");
 #define ClanguageId 13
-DATA(insert OID = 14 ( "sql" f t 0 2248 "postgres" _null_ ));
+DATA(insert OID = 14 ( "sql" f t 0 2248 _null_ ));
 DESCR("SQL-language functions");
 #define SQLlanguageId 14


--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
--- a/src/include/catalog/pg_shadow.h
+++ b/src/include/catalog/pg_shadow.h
@@ -9,7 +9,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: pg_shadow.h,v 1.21 2002/06/20 20:29:49 momjian Exp $
+ * $Id: pg_shadow.h,v 1.22 2002/07/24 19:11:13 petere Exp $
 *
 * NOTES
 *	  the genbki.sh script reads this file and generates .bki
@@ -34,7 +34,6 @@ CATALOG(pg_shadow) BOOTSTRAP BKI_SHARED_RELATION BKI_WITHOUT_OIDS
 	NameData	usename;
 	int4		usesysid;
 	bool		usecreatedb;
-	bool		usetrace;
 	bool		usesuper;		/* read this field via superuser() only */
 	bool		usecatupd;
 	/* remaining fields may be null; use heap_getattr to read them! */
@@ -54,16 +53,15 @@ typedef FormData_pg_shadow *Form_pg_shadow;
 *		compiler constants for pg_shadow
 * ----------------
 */
-#define Natts_pg_shadow				9
+#define Natts_pg_shadow				8
 #define Anum_pg_shadow_usename			1
 #define Anum_pg_shadow_usesysid			2
 #define Anum_pg_shadow_usecreatedb		3
-#define Anum_pg_shadow_usetrace			4
-#define Anum_pg_shadow_usesuper			5
-#define Anum_pg_shadow_usecatupd		6
-#define Anum_pg_shadow_passwd			7
-#define Anum_pg_shadow_valuntil			8
-#define Anum_pg_shadow_useconfig		9
+#define Anum_pg_shadow_usesuper			4
+#define Anum_pg_shadow_usecatupd		5
+#define Anum_pg_shadow_passwd			6
+#define Anum_pg_shadow_valuntil			7
+#define Anum_pg_shadow_useconfig		8

 /* ----------------
 *		initial contents of pg_shadow
@@ -72,7 +70,7 @@ typedef FormData_pg_shadow *Form_pg_shadow;
 * user choices.
 * ----------------
 */
-DATA(insert ( "POSTGRES" PGUID t t t t _null_ _null_ _null_ ));
+DATA(insert ( "POSTGRES" PGUID t t t _null_ _null_ _null_ ));

 #define BOOTSTRAP_USESYSID 1


--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -8,7 +8,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: pg_type.h,v 1.124 2002/07/16 03:30:27 momjian Exp $
+ * $Id: pg_type.h,v 1.125 2002/07/24 19:11:13 petere Exp $
 *
 * NOTES
 *	  the genbki.sh script reads this file and generates .bki
@@ -49,13 +49,6 @@ CATALOG(pg_type) BOOTSTRAP
 	 */
 	int2		typlen;

-	/*
-	 * typprtlen was once intended to be the length of the external
-	 * representation of a datatype, with the same interpretation as for
-	 * typlen.	But it's currently unused.
-	 */
-	int2		typprtlen;
-
 	/*
 	 * typbyval determines whether internal Postgres routines pass a value
 	 * of this type by value or by reference.  typbyval had better be
@@ -102,8 +95,6 @@ CATALOG(pg_type) BOOTSTRAP
 	 */
 	regproc		typinput;
 	regproc		typoutput;
-	regproc		typreceive;
-	regproc		typsend;

 	/* ----------------
 	 * typalign is the alignment required when storing a value of this
@@ -203,30 +194,27 @@ typedef FormData_pg_type *Form_pg_type;
 *		compiler constants for pg_type
 * ----------------
 */
-#define Natts_pg_type					23
+#define Natts_pg_type					20
 #define Anum_pg_type_typname			1
 #define Anum_pg_type_typnamespace		2
 #define Anum_pg_type_typowner			3
 #define Anum_pg_type_typlen				4
-#define Anum_pg_type_typprtlen			5
-#define Anum_pg_type_typbyval			6
-#define Anum_pg_type_typtype			7
-#define Anum_pg_type_typisdefined		8
-#define Anum_pg_type_typdelim			9
-#define Anum_pg_type_typrelid			10
-#define Anum_pg_type_typelem			11
-#define Anum_pg_type_typinput			12
-#define Anum_pg_type_typoutput			13
-#define Anum_pg_type_typreceive			14
-#define Anum_pg_type_typsend			15
-#define Anum_pg_type_typalign			16
-#define Anum_pg_type_typstorage			17
-#define Anum_pg_type_typnotnull			18
-#define Anum_pg_type_typbasetype		19
-#define Anum_pg_type_typtypmod			20
-#define Anum_pg_type_typndims			21
-#define Anum_pg_type_typdefaultbin		22
-#define Anum_pg_type_typdefault			23
+#define Anum_pg_type_typbyval			5
+#define Anum_pg_type_typtype			6
+#define Anum_pg_type_typisdefined		7
+#define Anum_pg_type_typdelim			8
+#define Anum_pg_type_typrelid			9
+#define Anum_pg_type_typelem			10
+#define Anum_pg_type_typinput			11
+#define Anum_pg_type_typoutput			12
+#define Anum_pg_type_typalign			13
+#define Anum_pg_type_typstorage			14
+#define Anum_pg_type_typnotnull			15
+#define Anum_pg_type_typbasetype		16
+#define Anum_pg_type_typtypmod			17
+#define Anum_pg_type_typndims			18
+#define Anum_pg_type_typdefaultbin		19
+#define Anum_pg_type_typdefault			20


 /* ----------------
@@ -242,82 +230,82 @@ typedef FormData_pg_type *Form_pg_type;
 */

 /* OIDS 1 - 99 */
-DATA(insert OID = 16 (	bool	   PGNSP PGUID  1   1 t b t \054 0   0 boolin boolout boolin boolout c p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 16 (	bool	   PGNSP PGUID  1 t b t \054 0   0 boolin boolout c p f 0 -1 0 _null_ _null_ ));
 DESCR("boolean, 'true'/'false'");
 #define BOOLOID			16

-DATA(insert OID = 17 (	bytea	   PGNSP PGUID -1  -1 f b t \054 0  0 byteain byteaout byteain byteaout i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 17 (	bytea	   PGNSP PGUID -1 f b t \054 0  0 byteain byteaout i x f 0 -1 0 _null_ _null_ ));
 DESCR("variable-length string, binary values escaped");
 #define BYTEAOID		17

-DATA(insert OID = 18 (	char	   PGNSP PGUID  1   1 t b t \054 0   0 charin charout charin charout c p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 18 (	char	   PGNSP PGUID  1 t b t \054 0   0 charin charout c p f 0 -1 0 _null_ _null_ ));
 DESCR("single character");
 #define CHAROID			18

-DATA(insert OID = 19 (	name	   PGNSP PGUID NAMEDATALEN NAMEDATALEN  f b t \054 0	18 namein nameout namein nameout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 19 (	name	   PGNSP PGUID NAMEDATALEN f b t \054 0	18 namein nameout i p f 0 -1 0 _null_ _null_ ));
 DESCR("31-character type for storing system identifiers");
 #define NAMEOID			19

-DATA(insert OID = 20 (	int8	   PGNSP PGUID  8  20 f b t \054 0   0 int8in int8out int8in int8out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 20 (	int8	   PGNSP PGUID  8 f b t \054 0   0 int8in int8out d p f 0 -1 0 _null_ _null_ ));
 DESCR("~18 digit integer, 8-byte storage");
 #define INT8OID			20

-DATA(insert OID = 21 (	int2	   PGNSP PGUID  2   5 t b t \054 0   0 int2in int2out int2in int2out s p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 21 (	int2	   PGNSP PGUID  2 t b t \054 0   0 int2in int2out s p f 0 -1 0 _null_ _null_ ));
 DESCR("-32 thousand to 32 thousand, 2-byte storage");
 #define INT2OID			21

-DATA(insert OID = 22 (	int2vector PGNSP PGUID INDEX_MAX_KEYS*2 -1 f b t \054 0  21 int2vectorin int2vectorout int2vectorin int2vectorout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 22 (	int2vector PGNSP PGUID INDEX_MAX_KEYS*2 f b t \054 0  21 int2vectorin int2vectorout i p f 0 -1 0 _null_ _null_ ));
 DESCR("array of INDEX_MAX_KEYS int2 integers, used in system tables");
 #define INT2VECTOROID	22

-DATA(insert OID = 23 (	int4	   PGNSP PGUID  4  10 t b t \054 0   0 int4in int4out int4in int4out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 23 (	int4	   PGNSP PGUID  4 t b t \054 0   0 int4in int4out i p f 0 -1 0 _null_ _null_ ));
 DESCR("-2 billion to 2 billion integer, 4-byte storage");
 #define INT4OID			23

-DATA(insert OID = 24 (	regproc    PGNSP PGUID  4  -1 t b t \054 0   0 regprocin regprocout regprocin regprocout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 24 (	regproc    PGNSP PGUID  4 t b t \054 0   0 regprocin regprocout i p f 0 -1 0 _null_ _null_ ));
 DESCR("registered procedure");
 #define REGPROCOID		24

-DATA(insert OID = 25 (	text	   PGNSP PGUID -1  -1 f b t \054 0  0 textin textout textin textout i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 25 (	text	   PGNSP PGUID -1 f b t \054 0  0 textin textout i x f 0 -1 0 _null_ _null_ ));
 DESCR("variable-length string, no limit specified");
 #define TEXTOID			25

-DATA(insert OID = 26 (	oid		   PGNSP PGUID  4  10 t b t \054 0   0 oidin oidout oidin oidout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 26 (	oid		   PGNSP PGUID  4 t b t \054 0   0 oidin oidout i p f 0 -1 0 _null_ _null_ ));
 DESCR("object identifier(oid), maximum 4 billion");
 #define OIDOID			26

-DATA(insert OID = 27 (	tid		   PGNSP PGUID  6  19 f b t \054 0   0 tidin tidout tidin tidout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 27 (	tid		   PGNSP PGUID  6 f b t \054 0   0 tidin tidout i p f 0 -1 0 _null_ _null_ ));
 DESCR("(Block, offset), physical location of tuple");
 #define TIDOID		27

-DATA(insert OID = 28 (	xid		   PGNSP PGUID  4  12 t b t \054 0   0 xidin xidout xidin xidout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 28 (	xid		   PGNSP PGUID  4 t b t \054 0   0 xidin xidout i p f 0 -1 0 _null_ _null_ ));
 DESCR("transaction id");
 #define XIDOID 28

-DATA(insert OID = 29 (	cid		   PGNSP PGUID  4  10 t b t \054 0   0 cidin cidout cidin cidout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 29 (	cid		   PGNSP PGUID  4 t b t \054 0   0 cidin cidout i p f 0 -1 0 _null_ _null_ ));
 DESCR("command identifier type, sequence in transaction id");
 #define CIDOID 29

-DATA(insert OID = 30 (	oidvector  PGNSP PGUID INDEX_MAX_KEYS*4 -1 f b t \054 0  26 oidvectorin oidvectorout oidvectorin oidvectorout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 30 (	oidvector  PGNSP PGUID INDEX_MAX_KEYS*4 f b t \054 0  26 oidvectorin oidvectorout i p f 0 -1 0 _null_ _null_ ));
 DESCR("array of INDEX_MAX_KEYS oids, used in system tables");
 #define OIDVECTOROID	30

-DATA(insert OID = 32 (	SET		   PGNSP PGUID -1  -1 f b t \054 0   0 unknownin unknownout unknownin unknownout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 32 (	SET		   PGNSP PGUID -1 f b t \054 0   0 unknownin unknownout i p f 0 -1 0 _null_ _null_ ));
 DESCR("set of tuples");

-DATA(insert OID = 71 (	pg_type		 PGNSP PGUID 4 4 t c t \054 1247 0 int4in int4out int4in int4out i p f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 75 (	pg_attribute PGNSP PGUID 4 4 t c t \054 1249 0 int4in int4out int4in int4out i p f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 81 (	pg_proc		 PGNSP PGUID 4 4 t c t \054 1255 0 int4in int4out int4in int4out i p f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 83 (	pg_class	 PGNSP PGUID 4 4 t c t \054 1259 0 int4in int4out int4in int4out i p f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 86 (	pg_shadow	 PGNSP PGUID 4 4 t c t \054 1260 0 int4in int4out int4in int4out i p f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 87 (	pg_group	 PGNSP PGUID 4 4 t c t \054 1261 0 int4in int4out int4in int4out i p f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 88 (	pg_database  PGNSP PGUID 4 4 t c t \054 1262 0 int4in int4out int4in int4out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 71 (	pg_type		 PGNSP PGUID 4 t c t \054 1247 0 int4in int4out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 75 (	pg_attribute PGNSP PGUID 4 t c t \054 1249 0 int4in int4out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 81 (	pg_proc		 PGNSP PGUID 4 t c t \054 1255 0 int4in int4out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 83 (	pg_class	 PGNSP PGUID 4 t c t \054 1259 0 int4in int4out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 86 (	pg_shadow	 PGNSP PGUID 4 t c t \054 1260 0 int4in int4out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 87 (	pg_group	 PGNSP PGUID 4 t c t \054 1261 0 int4in int4out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 88 (	pg_database  PGNSP PGUID 4 t c t \054 1262 0 int4in int4out i p f 0 -1 0 _null_ _null_ ));

 /* OIDS 100 - 199 */

 /* OIDS 200 - 299 */

-DATA(insert OID = 210 (  smgr	   PGNSP PGUID 2	12 t b t \054 0 0 smgrin smgrout smgrin smgrout s p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 210 (  smgr	   PGNSP PGUID 2 t b t \054 0 0 smgrin smgrout s p f 0 -1 0 _null_ _null_ ));
 DESCR("storage manager");

 /* OIDS 300 - 399 */
@@ -327,191 +315,191 @@ DESCR("storage manager");
 /* OIDS 500 - 599 */

 /* OIDS 600 - 699 */
-DATA(insert OID = 600 (  point	   PGNSP PGUID 16  24 f b t \054 0 701 point_in point_out point_in point_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 600 (  point	   PGNSP PGUID 16 f b t \054 0 701 point_in point_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("geometric point '(x, y)'");
 #define POINTOID		600
-DATA(insert OID = 601 (  lseg	   PGNSP PGUID 32  48 f b t \054 0 600 lseg_in lseg_out lseg_in lseg_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 601 (  lseg	   PGNSP PGUID 32 f b t \054 0 600 lseg_in lseg_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("geometric line segment '(pt1,pt2)'");
 #define LSEGOID			601
-DATA(insert OID = 602 (  path	   PGNSP PGUID -1  -1 f b t \054 0 0 path_in path_out path_in path_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 602 (  path	   PGNSP PGUID -1 f b t \054 0 0 path_in path_out d x f 0 -1 0 _null_ _null_ ));
 DESCR("geometric path '(pt1,...)'");
 #define PATHOID			602
-DATA(insert OID = 603 (  box	   PGNSP PGUID 32 100 f b t \073 0 600 box_in box_out box_in box_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 603 (  box	   PGNSP PGUID 32 f b t \073 0 600 box_in box_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("geometric box '(lower left,upper right)'");
 #define BOXOID			603
-DATA(insert OID = 604 (  polygon   PGNSP PGUID -1  -1 f b t \054 0   0 poly_in poly_out poly_in poly_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 604 (  polygon   PGNSP PGUID -1 f b t \054 0   0 poly_in poly_out d x f 0 -1 0 _null_ _null_ ));
 DESCR("geometric polygon '(pt1,...)'");
 #define POLYGONOID		604

-DATA(insert OID = 628 (  line	   PGNSP PGUID 32  48 f b t \054 0 701 line_in line_out line_in line_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 628 (  line	   PGNSP PGUID 32 f b t \054 0 701 line_in line_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("geometric line (not implemented)'");
 #define LINEOID			628
-DATA(insert OID = 629 (  _line	   PGNSP PGUID  -1 -1 f b t \054 0 628 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 629 (  _line	   PGNSP PGUID  -1 f b t \054 0 628 array_in array_out d x f 0 -1 0 _null_ _null_ ));
 DESCR("");

 /* OIDS 700 - 799 */

-DATA(insert OID = 700 (  float4    PGNSP PGUID  4  12 f b t \054 0   0 float4in float4out float4in float4out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 700 (  float4    PGNSP PGUID  4 f b t \054 0   0 float4in float4out i p f 0 -1 0 _null_ _null_ ));
 DESCR("single-precision floating point number, 4-byte storage");
 #define FLOAT4OID 700
-DATA(insert OID = 701 (  float8    PGNSP PGUID  8  24 f b t \054 0   0 float8in float8out float8in float8out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 701 (  float8    PGNSP PGUID  8 f b t \054 0   0 float8in float8out d p f 0 -1 0 _null_ _null_ ));
 DESCR("double-precision floating point number, 8-byte storage");
 #define FLOAT8OID 701
-DATA(insert OID = 702 (  abstime   PGNSP PGUID  4  20 t b t \054 0   0 nabstimein nabstimeout nabstimein nabstimeout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 702 (  abstime   PGNSP PGUID  4 t b t \054 0   0 nabstimein nabstimeout i p f 0 -1 0 _null_ _null_ ));
 DESCR("absolute, limited-range date and time (Unix system time)");
 #define ABSTIMEOID		702
-DATA(insert OID = 703 (  reltime   PGNSP PGUID  4  20 t b t \054 0   0 reltimein reltimeout reltimein reltimeout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 703 (  reltime   PGNSP PGUID  4 t b t \054 0   0 reltimein reltimeout i p f 0 -1 0 _null_ _null_ ));
 DESCR("relative, limited-range time interval (Unix delta time)");
 #define RELTIMEOID		703
-DATA(insert OID = 704 (  tinterval PGNSP PGUID 12  47 f b t \054 0   0 tintervalin tintervalout tintervalin tintervalout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 704 (  tinterval PGNSP PGUID 12 f b t \054 0   0 tintervalin tintervalout i p f 0 -1 0 _null_ _null_ ));
 DESCR("(abstime,abstime), time interval");
 #define TINTERVALOID	704
-DATA(insert OID = 705 (  unknown   PGNSP PGUID -1  -1 f b t \054 0   0 unknownin unknownout unknownin unknownout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 705 (  unknown   PGNSP PGUID -1 f b t \054 0   0 unknownin unknownout i p f 0 -1 0 _null_ _null_ ));
 DESCR("");
 #define UNKNOWNOID		705

-DATA(insert OID = 718 (  circle    PGNSP PGUID  24 47 f b t \054 0	0 circle_in circle_out circle_in circle_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 718 (  circle    PGNSP PGUID  24 f b t \054 0	0 circle_in circle_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("geometric circle '(center,radius)'");
 #define CIRCLEOID		718
-DATA(insert OID = 719 (  _circle   PGNSP PGUID  -1 -1 f b t \054 0  718 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 790 (  money	   PGNSP PGUID   4 24 f b t \054 0	0 cash_in cash_out cash_in cash_out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 719 (  _circle   PGNSP PGUID  -1 f b t \054 0  718 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 790 (  money	   PGNSP PGUID   4 f b t \054 0	0 cash_in cash_out i p f 0 -1 0 _null_ _null_ ));
 DESCR("$d,ddd.cc, money");
 #define CASHOID 790
-DATA(insert OID = 791 (  _money    PGNSP PGUID  -1 -1 f b t \054 0  790 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 791 (  _money    PGNSP PGUID  -1 f b t \054 0  790 array_in array_out i x f 0 -1 0 _null_ _null_ ));

 /* OIDS 800 - 899 */
-DATA(insert OID = 829 ( macaddr    PGNSP PGUID  6 -1 f b t \054 0 0 macaddr_in macaddr_out macaddr_in macaddr_out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 829 ( macaddr    PGNSP PGUID  6 f b t \054 0 0 macaddr_in macaddr_out i p f 0 -1 0 _null_ _null_ ));
 DESCR("XX:XX:XX:XX:XX:XX, MAC address");
 #define MACADDROID 829
-DATA(insert OID = 869 ( inet	   PGNSP PGUID  -1 -1 f b t \054 0 0 inet_in inet_out inet_in inet_out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 869 ( inet	   PGNSP PGUID  -1 f b t \054 0 0 inet_in inet_out i p f 0 -1 0 _null_ _null_ ));
 DESCR("IP address/netmask, host address, netmask optional");
 #define INETOID 869
-DATA(insert OID = 650 ( cidr	   PGNSP PGUID  -1 -1 f b t \054 0 0 cidr_in cidr_out cidr_in cidr_out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 650 ( cidr	   PGNSP PGUID  -1 f b t \054 0 0 cidr_in cidr_out i p f 0 -1 0 _null_ _null_ ));
 DESCR("network IP address/netmask, network address");
 #define CIDROID 650

 /* OIDS 900 - 999 */

 /* OIDS 1000 - 1099 */
-DATA(insert OID = 1000 (  _bool		 PGNSP PGUID -1  -1 f b t \054 0	16 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1001 (  _bytea	 PGNSP PGUID -1  -1 f b t \054 0	17 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1002 (  _char		 PGNSP PGUID -1  -1 f b t \054 0	18 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1003 (  _name		 PGNSP PGUID -1  -1 f b t \054 0	19 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1005 (  _int2		 PGNSP PGUID -1  -1 f b t \054 0	21 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1006 (  _int2vector PGNSP PGUID -1 -1 f b t \054 0	22 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1007 (  _int4		 PGNSP PGUID -1  -1 f b t \054 0	23 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1008 (  _regproc	 PGNSP PGUID -1  -1 f b t \054 0	24 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1009 (  _text		 PGNSP PGUID -1  -1 f b t \054 0	25 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1028 (  _oid		 PGNSP PGUID -1  -1 f b t \054 0	26 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1010 (  _tid		 PGNSP PGUID -1  -1 f b t \054 0	27 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1011 (  _xid		 PGNSP PGUID -1  -1 f b t \054 0	28 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1012 (  _cid		 PGNSP PGUID -1  -1 f b t \054 0	29 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1013 (  _oidvector PGNSP PGUID -1  -1 f b t \054 0	30 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1014 (  _bpchar	 PGNSP PGUID -1  -1 f b t \054 0 1042 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1015 (  _varchar	 PGNSP PGUID -1  -1 f b t \054 0 1043 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1016 (  _int8		 PGNSP PGUID -1  -1 f b t \054 0	20 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1017 (  _point	 PGNSP PGUID -1  -1 f b t \054 0 600 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1018 (  _lseg		 PGNSP PGUID -1  -1 f b t \054 0 601 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1019 (  _path		 PGNSP PGUID -1  -1 f b t \054 0 602 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1020 (  _box		 PGNSP PGUID -1  -1 f b t \073 0 603 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1021 (  _float4	 PGNSP PGUID -1  -1 f b t \054 0 700 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1022 (  _float8	 PGNSP PGUID -1  -1 f b t \054 0 701 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1023 (  _abstime	 PGNSP PGUID -1  -1 f b t \054 0 702 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1024 (  _reltime	 PGNSP PGUID -1  -1 f b t \054 0 703 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1025 (  _tinterval PGNSP PGUID -1  -1 f b t \054 0 704 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1027 (  _polygon	 PGNSP PGUID -1  -1 f b t \054 0 604 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1033 (  aclitem	 PGNSP PGUID 8   -1 f b t \054 0 0 aclitemin aclitemout aclitemin aclitemout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1000 (  _bool		 PGNSP PGUID -1 f b t \054 0	16 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1001 (  _bytea	 PGNSP PGUID -1 f b t \054 0	17 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1002 (  _char		 PGNSP PGUID -1 f b t \054 0	18 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1003 (  _name		 PGNSP PGUID -1 f b t \054 0	19 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1005 (  _int2		 PGNSP PGUID -1 f b t \054 0	21 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1006 (  _int2vector PGNSP PGUID -1 f b t \054 0	22 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1007 (  _int4		 PGNSP PGUID -1 f b t \054 0	23 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1008 (  _regproc	 PGNSP PGUID -1 f b t \054 0	24 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1009 (  _text		 PGNSP PGUID -1 f b t \054 0	25 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1028 (  _oid		 PGNSP PGUID -1 f b t \054 0	26 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1010 (  _tid		 PGNSP PGUID -1 f b t \054 0	27 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1011 (  _xid		 PGNSP PGUID -1 f b t \054 0	28 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1012 (  _cid		 PGNSP PGUID -1 f b t \054 0	29 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1013 (  _oidvector PGNSP PGUID -1 f b t \054 0	30 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1014 (  _bpchar	 PGNSP PGUID -1 f b t \054 0 1042 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1015 (  _varchar	 PGNSP PGUID -1 f b t \054 0 1043 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1016 (  _int8		 PGNSP PGUID -1 f b t \054 0	20 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1017 (  _point	 PGNSP PGUID -1 f b t \054 0 600 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1018 (  _lseg		 PGNSP PGUID -1 f b t \054 0 601 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1019 (  _path		 PGNSP PGUID -1 f b t \054 0 602 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1020 (  _box		 PGNSP PGUID -1 f b t \073 0 603 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1021 (  _float4	 PGNSP PGUID -1 f b t \054 0 700 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1022 (  _float8	 PGNSP PGUID -1 f b t \054 0 701 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1023 (  _abstime	 PGNSP PGUID -1 f b t \054 0 702 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1024 (  _reltime	 PGNSP PGUID -1 f b t \054 0 703 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1025 (  _tinterval PGNSP PGUID -1 f b t \054 0 704 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1027 (  _polygon	 PGNSP PGUID -1 f b t \054 0 604 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1033 (  aclitem	 PGNSP PGUID  8 f b t \054 0 0 aclitemin aclitemout i p f 0 -1 0 _null_ _null_ ));
 DESCR("access control list");
-DATA(insert OID = 1034 (  _aclitem	 PGNSP PGUID -1 -1 f b t \054 0 1033 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1040 (  _macaddr	 PGNSP PGUID -1 -1 f b t \054 0  829 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1041 (  _inet    PGNSP PGUID -1 -1 f b t \054 0  869 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 651  (  _cidr    PGNSP PGUID -1 -1 f b t \054 0  650 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1042 ( bpchar		 PGNSP PGUID -1  -1 f b t \054 0	0 bpcharin bpcharout bpcharin bpcharout i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1034 (  _aclitem	 PGNSP PGUID -1 f b t \054 0 1033 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1040 (  _macaddr	 PGNSP PGUID -1 f b t \054 0  829 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1041 (  _inet    PGNSP PGUID -1 f b t \054 0  869 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 651  (  _cidr    PGNSP PGUID -1 f b t \054 0  650 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1042 ( bpchar		 PGNSP PGUID -1 f b t \054 0	0 bpcharin bpcharout i x f 0 -1 0 _null_ _null_ ));
 DESCR("char(length), blank-padded string, fixed storage length");
 #define BPCHAROID		1042
-DATA(insert OID = 1043 ( varchar	 PGNSP PGUID -1  -1 f b t \054 0	0 varcharin varcharout varcharin varcharout i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1043 ( varchar	 PGNSP PGUID -1 f b t \054 0	0 varcharin varcharout i x f 0 -1 0 _null_ _null_ ));
 DESCR("varchar(length), non-blank-padded string, variable storage length");
 #define VARCHAROID		1043

-DATA(insert OID = 1082 ( date		 PGNSP PGUID	4  10 t b t \054 0	0 date_in date_out date_in date_out i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1082 ( date		 PGNSP PGUID	4 t b t \054 0	0 date_in date_out i p f 0 -1 0 _null_ _null_ ));
 DESCR("ANSI SQL date");
 #define DATEOID			1082
-DATA(insert OID = 1083 ( time		 PGNSP PGUID	8  16 f b t \054 0	0 time_in time_out time_in time_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1083 ( time		 PGNSP PGUID	8 f b t \054 0	0 time_in time_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("hh:mm:ss, ANSI SQL time");
 #define TIMEOID			1083

 /* OIDS 1100 - 1199 */
-DATA(insert OID = 1114 ( timestamp	 PGNSP PGUID	8  47 f b t \054 0	0 timestamp_in timestamp_out timestamp_in timestamp_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1114 ( timestamp	 PGNSP PGUID	8 f b t \054 0	0 timestamp_in timestamp_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("date and time");
 #define TIMESTAMPOID	1114
-DATA(insert OID = 1115 ( _timestamp  PGNSP PGUID	-1 -1 f b t \054 0	1114 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1182 ( _date		 PGNSP PGUID	-1 -1 f b t \054 0	1082 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1183 ( _time		 PGNSP PGUID	-1 -1 f b t \054 0	1083 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1184 ( timestamptz PGNSP PGUID	8  47 f b t \054 0	0 timestamptz_in timestamptz_out timestamptz_in timestamptz_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1115 ( _timestamp  PGNSP PGUID	-1 f b t \054 0	1114 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1182 ( _date		 PGNSP PGUID	-1 f b t \054 0	1082 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1183 ( _time		 PGNSP PGUID	-1 f b t \054 0	1083 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1184 ( timestamptz PGNSP PGUID	8 f b t \054 0	0 timestamptz_in timestamptz_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("date and time with time zone");
 #define TIMESTAMPTZOID	1184
-DATA(insert OID = 1185 ( _timestamptz PGNSP PGUID -1 -1 f b t \054 0	1184 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1186 ( interval	 PGNSP PGUID 12  47 f b t \054 0	0 interval_in interval_out interval_in interval_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1185 ( _timestamptz PGNSP PGUID -1 f b t \054 0	1184 array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1186 ( interval	 PGNSP PGUID 12 f b t \054 0	0 interval_in interval_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("@ <number> <units>, time interval");
 #define INTERVALOID		1186
-DATA(insert OID = 1187 ( _interval	 PGNSP PGUID	-1 -1 f b t \054 0	1186 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1187 ( _interval	 PGNSP PGUID	-1 f b t \054 0	1186 array_in array_out d x f 0 -1 0 _null_ _null_ ));

 /* OIDS 1200 - 1299 */
-DATA(insert OID = 1231 (  _numeric	 PGNSP PGUID -1  -1 f b t \054 0	1700 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1266 ( timetz		 PGNSP PGUID 12  22 f b t \054 0	0 timetz_in timetz_out timetz_in timetz_out d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1231 (  _numeric	 PGNSP PGUID -1 f b t \054 0	1700 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1266 ( timetz		 PGNSP PGUID 12 f b t \054 0	0 timetz_in timetz_out d p f 0 -1 0 _null_ _null_ ));
 DESCR("hh:mm:ss, ANSI SQL time");
 #define TIMETZOID		1266
-DATA(insert OID = 1270 ( _timetz	 PGNSP PGUID	-1 -1 f b t \054 0	1266 array_in array_out array_in array_out d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1270 ( _timetz	 PGNSP PGUID -1 f b t \054 0	1266 array_in array_out d x f 0 -1 0 _null_ _null_ ));

 /* OIDS 1500 - 1599 */
-DATA(insert OID = 1560 ( bit		 PGNSP PGUID -1  -1 f b t \054 0	0 bit_in bit_out bit_in bit_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1560 ( bit		 PGNSP PGUID -1 f b t \054 0	0 bit_in bit_out i x f 0 -1 0 _null_ _null_ ));
 DESCR("fixed-length bit string");
 #define BITOID	 1560
-DATA(insert OID = 1561 ( _bit		 PGNSP PGUID	-1 -1 f b t \054 0	1560 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1562 ( varbit		 PGNSP PGUID -1  -1 f b t \054 0	0 varbit_in varbit_out varbit_in varbit_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1561 ( _bit		 PGNSP PGUID -1 f b t \054 0	1560 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1562 ( varbit		 PGNSP PGUID -1 f b t \054 0	0 varbit_in varbit_out i x f 0 -1 0 _null_ _null_ ));
 DESCR("variable-length bit string");
 #define VARBITOID	  1562
-DATA(insert OID = 1563 ( _varbit	 PGNSP PGUID	-1 -1 f b t \054 0	1562 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1563 ( _varbit	 PGNSP PGUID -1 f b t \054 0	1562 array_in array_out i x f 0 -1 0 _null_ _null_ ));

 /* OIDS 1600 - 1699 */

 /* OIDS 1700 - 1799 */
-DATA(insert OID = 1700 ( numeric	   PGNSP PGUID -1  -1 f b t \054 0  0 numeric_in numeric_out numeric_in numeric_out i m f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1700 ( numeric	   PGNSP PGUID -1 f b t \054 0  0 numeric_in numeric_out i m f 0 -1 0 _null_ _null_ ));
 DESCR("numeric(precision, decimal), arbitrary precision number");
 #define NUMERICOID		1700

-DATA(insert OID = 1790 ( refcursor	   PGNSP PGUID -1  -1 f b t \054 0  0 textin textout textin textout i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1790 ( refcursor	   PGNSP PGUID -1 f b t \054 0  0 textin textout i x f 0 -1 0 _null_ _null_ ));
 DESCR("reference cursor (portal name)");
 #define REFCURSOROID	1790

 /* OIDS 2200 - 2299 */
-DATA(insert OID = 2201 ( _refcursor	   PGNSP PGUID -1  -1 f b t \054 0 1790 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2201 ( _refcursor	   PGNSP PGUID -1 f b t \054 0 1790 array_in array_out i x f 0 -1 0 _null_ _null_ ));

-DATA(insert OID = 2202 ( regprocedure  PGNSP PGUID  4  -1 t b t \054 0   0 regprocedurein regprocedureout regprocedurein regprocedureout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2202 ( regprocedure  PGNSP PGUID  4 t b t \054 0   0 regprocedurein regprocedureout i p f 0 -1 0 _null_ _null_ ));
 DESCR("registered procedure (with args)");
 #define REGPROCEDUREOID	2202

-DATA(insert OID = 2203 ( regoper       PGNSP PGUID  4  -1 t b t \054 0   0 regoperin regoperout regoperin regoperout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2203 ( regoper       PGNSP PGUID  4 t b t \054 0   0 regoperin regoperout i p f 0 -1 0 _null_ _null_ ));
 DESCR("registered operator");
 #define REGOPEROID		2203

-DATA(insert OID = 2204 ( regoperator   PGNSP PGUID  4  -1 t b t \054 0   0 regoperatorin regoperatorout regoperatorin regoperatorout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2204 ( regoperator   PGNSP PGUID  4 t b t \054 0   0 regoperatorin regoperatorout i p f 0 -1 0 _null_ _null_ ));
 DESCR("registered operator (with args)");
 #define REGOPERATOROID	2204

-DATA(insert OID = 2205 ( regclass      PGNSP PGUID  4  -1 t b t \054 0   0 regclassin regclassout regclassin regclassout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2205 ( regclass      PGNSP PGUID  4 t b t \054 0   0 regclassin regclassout i p f 0 -1 0 _null_ _null_ ));
 DESCR("registered class");
 #define REGCLASSOID		2205

-DATA(insert OID = 2206 ( regtype       PGNSP PGUID  4  -1 t b t \054 0   0 regtypein regtypeout regtypein regtypeout i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2206 ( regtype       PGNSP PGUID  4 t b t \054 0   0 regtypein regtypeout i p f 0 -1 0 _null_ _null_ ));
 DESCR("registered type");
 #define REGTYPEOID		2206

-DATA(insert OID = 2207 ( _regprocedure PGNSP PGUID -1  -1 f b t \054 0 2202 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 2208 ( _regoper      PGNSP PGUID -1  -1 f b t \054 0 2203 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 2209 ( _regoperator  PGNSP PGUID -1  -1 f b t \054 0 2204 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 2210 ( _regclass     PGNSP PGUID -1  -1 f b t \054 0 2205 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 2211 ( _regtype      PGNSP PGUID -1  -1 f b t \054 0 2206 array_in array_out array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2207 ( _regprocedure PGNSP PGUID -1 f b t \054 0 2202 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2208 ( _regoper      PGNSP PGUID -1 f b t \054 0 2203 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2209 ( _regoperator  PGNSP PGUID -1 f b t \054 0 2204 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2210 ( _regclass     PGNSP PGUID -1 f b t \054 0 2205 array_in array_out i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2211 ( _regtype      PGNSP PGUID -1 f b t \054 0 2206 array_in array_out i x f 0 -1 0 _null_ _null_ ));


 /*
@@ -524,13 +512,10 @@ extern Oid TypeCreate(const char *typeName,
 		   Oid assignedTypeOid,
 		   Oid relationOid,
 		   int16 internalSize,
-		   int16 externalSize,
 		   char typeType,
 		   char typDelim,
 		   Oid inputProcedure,
 		   Oid outputProcedure,
-		   Oid receiveProcedure,
-		   Oid sendProcedure,
 		   Oid elementType,
 		   Oid baseType,
 		   const char *defaultTypeValue,

--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -7,7 +7,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: parsenodes.h,v 1.193 2002/07/18 23:11:32 petere Exp $
+ * $Id: parsenodes.h,v 1.194 2002/07/24 19:11:14 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -1012,7 +1012,6 @@ typedef struct CreatePLangStmt
 	char	   *plname;			/* PL name */
 	List	   *plhandler;		/* PL call handler function (qual. name) */
 	List	   *plvalidator;	/* optional validator function (qual. name) */
-	char	   *plcompiler;		/* lancompiler text */
 	bool		pltrusted;		/* PL is trusted */
 } CreatePLangStmt;


--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -7,7 +7,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: cost.h,v 1.45 2002/06/20 20:29:51 momjian Exp $
+ * $Id: cost.h,v 1.46 2002/07/24 19:11:14 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -25,12 +25,6 @@
 #define DEFAULT_CPU_INDEX_TUPLE_COST 0.001
 #define DEFAULT_CPU_OPERATOR_COST  0.0025

-/* defaults for function attributes used for expensive function calculations */
-#define BYTE_PCT 100
-#define PERBYTE_CPU 0
-#define PERCALL_CPU 0
-#define OUTIN_RATIO 100
-

 /*
 * prototypes for costsize.c

--- a/src/test/regress/expected/oidjoins.out
+++ b/src/test/regress/expected/oidjoins.out
@@ -417,19 +417,3 @@ WHERE	pg_type.typoutput != 0 AND
 ------+-----------
 (0 rows)

-SELECT	ctid, pg_type.typreceive 
-FROM	pg_type 
-WHERE	pg_type.typreceive != 0 AND 
-	NOT EXISTS(SELECT * FROM pg_proc AS t1 WHERE t1.oid = pg_type.typreceive);
- ctid | typreceive 
------+------------
-(0 rows)
-
-SELECT	ctid, pg_type.typsend 
-FROM	pg_type 
-WHERE	pg_type.typsend != 0 AND 
-	NOT EXISTS(SELECT * FROM pg_proc AS t1 WHERE t1.oid = pg_type.typsend);
- ctid | typsend 
------+---------
-(0 rows)
-
--- a/src/test/regress/expected/rules.out
+++ b/src/test/regress/expected/rules.out
@@ -1288,7 +1288,7 @@ SELECT viewname, definition FROM pg_views ORDER BY viewname;
 pg_statio_user_tables    | SELECT pg_statio_all_tables.relid, pg_statio_all_tables.relname, pg_statio_all_tables.heap_blks_read, pg_statio_all_tables.heap_blks_hit, pg_statio_all_tables.idx_blks_read, pg_statio_all_tables.idx_blks_hit, pg_statio_all_tables.toast_blks_read, pg_statio_all_tables.toast_blks_hit, pg_statio_all_tables.tidx_blks_read, pg_statio_all_tables.tidx_blks_hit FROM pg_statio_all_tables WHERE (pg_statio_all_tables.relname !~ '^pg_'::text);
 pg_stats                 | SELECT c.relname AS tablename, a.attname, s.stanullfrac AS null_frac, s.stawidth AS avg_width, s.stadistinct AS n_distinct, CASE WHEN (1 = s.stakind1) THEN s.stavalues1 WHEN (1 = s.stakind2) THEN s.stavalues2 WHEN (1 = s.stakind3) THEN s.stavalues3 WHEN (1 = s.stakind4) THEN s.stavalues4 ELSE NULL::text[] END AS most_common_vals, CASE WHEN (1 = s.stakind1) THEN s.stanumbers1 WHEN (1 = s.stakind2) THEN s.stanumbers2 WHEN (1 = s.stakind3) THEN s.stanumbers3 WHEN (1 = s.stakind4) THEN s.stanumbers4 ELSE NULL::real[] END AS most_common_freqs, CASE WHEN (2 = s.stakind1) THEN s.stavalues1 WHEN (2 = s.stakind2) THEN s.stavalues2 WHEN (2 = s.stakind3) THEN s.stavalues3 WHEN (2 = s.stakind4) THEN s.stavalues4 ELSE NULL::text[] END AS histogram_bounds, CASE WHEN (3 = s.stakind1) THEN s.stanumbers1[1] WHEN (3 = s.stakind2) THEN s.stanumbers2[1] WHEN (3 = s.stakind3) THEN s.stanumbers3[1] WHEN (3 = s.stakind4) THEN s.stanumbers4[1] ELSE NULL::real END AS correlation FROM pg_class c, pg_attribute a, pg_statistic s WHERE ((((c.oid = s.starelid) AND (c.oid = a.attrelid)) AND (a.attnum = s.staattnum)) AND has_table_privilege(c.oid, 'select'::text));
 pg_tables                | SELECT c.relname AS tablename, pg_get_userbyid(c.relowner) AS tableowner, c.relhasindex AS hasindexes, c.relhasrules AS hasrules, (c.reltriggers > 0) AS hastriggers FROM pg_class c WHERE ((c.relkind = 'r'::"char") OR (c.relkind = 's'::"char"));
- pg_user                  | SELECT pg_shadow.usename, pg_shadow.usesysid, pg_shadow.usecreatedb, pg_shadow.usetrace, pg_shadow.usesuper, pg_shadow.usecatupd, '********'::text AS passwd, pg_shadow.valuntil, pg_shadow.useconfig FROM pg_shadow;
+ pg_user                  | SELECT pg_shadow.usename, pg_shadow.usesysid, pg_shadow.usecreatedb, pg_shadow.usesuper, pg_shadow.usecatupd, '********'::text AS passwd, pg_shadow.valuntil, pg_shadow.useconfig FROM pg_shadow;
 pg_views                 | SELECT n.nspname AS schemaname, c.relname AS viewname, pg_get_userbyid(c.relowner) AS viewowner, pg_get_viewdef(c.oid) AS definition FROM (pg_class c LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = 'v'::"char");
 rtest_v1                 | SELECT rtest_t1.a, rtest_t1.b FROM rtest_t1;
 rtest_vcomp              | SELECT x.part, (x.size * y.factor) AS size_in_cm FROM rtest_comp x, rtest_unitfact y WHERE (x.unit = y.unit);

--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -85,8 +85,7 @@ WHERE p1.typtype != 'c' AND p1.typname LIKE '\\_%' AND NOT EXISTS
 SELECT p1.oid, p1.typname
 FROM pg_type as p1
 WHERE p1.typtype != 'c' AND
-    (p1.typinput = 0 OR p1.typoutput = 0 OR
-     p1.typreceive = 0 OR p1.typsend = 0);
+    (p1.typinput = 0 OR p1.typoutput = 0);
 oid | typname 
 -----+---------
 (0 rows)
@@ -117,32 +116,6 @@ WHERE p1.typoutput = p2.oid AND p1.typtype = 'b' AND
 -----+---------+-----+---------
 (0 rows)

-- Check for bogus typreceive routines
-- FIXME: ought to check prorettype, but there are special cases that make it
-- hard: prorettype might be binary-compatible with the type but not the same,
-- and for array types array_in's result has nothing to do with anything.
-SELECT p1.oid, p1.typname, p2.oid, p2.proname
-FROM pg_type AS p1, pg_proc AS p2
-WHERE p1.typreceive = p2.oid AND p1.typtype = 'b' AND
-    (p2.pronargs != 1 OR p2.proretset) AND
-    (p2.pronargs != 3 OR p2.proretset OR p2.proargtypes[2] != 'int4'::regtype);
- oid | typname | oid | proname 
-----+---------+-----+---------
-(0 rows)
-
-- Check for bogus typsend routines
-- The first OR subclause detects bogus non-array cases,
-- the second one detects bogus array cases.
-- FIXME: ought to check prorettype, but not clear what it should be.
-SELECT p1.oid, p1.typname, p2.oid, p2.proname
-FROM pg_type AS p1, pg_proc AS p2
-WHERE p1.typsend = p2.oid AND p1.typtype = 'b' AND
-    (p2.pronargs != 1 OR p2.proretset) AND
-    (p2.pronargs != 2 OR p2.proretset OR p1.typelem = 0);
- oid | typname | oid | proname 
-----+---------+-----+---------
-(0 rows)
-
 -- **************** pg_class ****************
 -- Look for illegal values in pg_class fields
 SELECT p1.oid, p1.relname

--- a/src/test/regress/sql/oidjoins.sql
+++ b/src/test/regress/sql/oidjoins.sql
@@ -209,11 +209,3 @@ SELECT	ctid, pg_type.typoutput
 FROM	pg_type 
 WHERE	pg_type.typoutput != 0 AND 
 	NOT EXISTS(SELECT * FROM pg_proc AS t1 WHERE t1.oid = pg_type.typoutput);
-SELECT	ctid, pg_type.typreceive 
-FROM	pg_type 
-WHERE	pg_type.typreceive != 0 AND 
-	NOT EXISTS(SELECT * FROM pg_proc AS t1 WHERE t1.oid = pg_type.typreceive);
-SELECT	ctid, pg_type.typsend 
-FROM	pg_type 
-WHERE	pg_type.typsend != 0 AND 
-	NOT EXISTS(SELECT * FROM pg_proc AS t1 WHERE t1.oid = pg_type.typsend);
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -73,8 +73,7 @@ WHERE p1.typtype != 'c' AND p1.typname LIKE '\\_%' AND NOT EXISTS
 SELECT p1.oid, p1.typname
 FROM pg_type as p1
 WHERE p1.typtype != 'c' AND
-    (p1.typinput = 0 OR p1.typoutput = 0 OR
-     p1.typreceive = 0 OR p1.typsend = 0);
+    (p1.typinput = 0 OR p1.typoutput = 0);

 -- Check for bogus typinput routines
 -- FIXME: ought to check prorettype, but there are special cases that make it
@@ -98,28 +97,6 @@ WHERE p1.typoutput = p2.oid AND p1.typtype = 'b' AND
    (p2.pronargs != 1 OR p2.proretset) AND
    (p2.pronargs != 2 OR p2.proretset OR p1.typelem = 0);

-- Check for bogus typreceive routines
-- FIXME: ought to check prorettype, but there are special cases that make it
-- hard: prorettype might be binary-compatible with the type but not the same,
-- and for array types array_in's result has nothing to do with anything.
-
-SELECT p1.oid, p1.typname, p2.oid, p2.proname
-FROM pg_type AS p1, pg_proc AS p2
-WHERE p1.typreceive = p2.oid AND p1.typtype = 'b' AND
-    (p2.pronargs != 1 OR p2.proretset) AND
-    (p2.pronargs != 3 OR p2.proretset OR p2.proargtypes[2] != 'int4'::regtype);
-
-- Check for bogus typsend routines
-- The first OR subclause detects bogus non-array cases,
-- the second one detects bogus array cases.
-- FIXME: ought to check prorettype, but not clear what it should be.
-
-SELECT p1.oid, p1.typname, p2.oid, p2.proname
-FROM pg_type AS p1, pg_proc AS p2
-WHERE p1.typsend = p2.oid AND p1.typtype = 'b' AND
-    (p2.pronargs != 1 OR p2.proretset) AND
-    (p2.pronargs != 2 OR p2.proretset OR p1.typelem = 0);
-
 -- **************** pg_class ****************

 -- Look for illegal values in pg_class fields