From 739adf32eecfe129aea09f543370d886045c7c01 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 24 Jul 2002 19:11:14 +0000
Subject: [PATCH] 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.)
---
 doc/src/sgml/catalogs.sgml                |   88 +-
 doc/src/sgml/ref/create_function.sgml     |    9 +-
 doc/src/sgml/ref/create_language.sgml     |   13 +-
 doc/src/sgml/ref/create_type.sgml         |   53 +-
 src/backend/catalog/heap.c                |    5 +-
 src/backend/catalog/pg_aggregate.c        |    6 +-
 src/backend/catalog/pg_operator.c         |   12 +-
 src/backend/catalog/pg_proc.c             |   11 +-
 src/backend/catalog/pg_type.c             |   30 +-
 src/backend/commands/functioncmds.c       |   46 +-
 src/backend/commands/operatorcmds.c       |   17 +-
 src/backend/commands/proclang.c           |    4 +-
 src/backend/commands/typecmds.c           |   40 +-
 src/backend/commands/user.c               |    3 +-
 src/backend/nodes/copyfuncs.c             |    4 +-
 src/backend/nodes/equalfuncs.c            |    4 +-
 src/backend/parser/gram.y                 |    3 +-
 src/backend/utils/Gen_fmgrtab.sh          |    8 +-
 src/backend/utils/adt/sets.c              |    6 +-
 src/bin/initdb/initdb.sh                  |    3 +-
 src/bin/pg_dump/pg_dump.c                 |   62 +-
 src/include/catalog/catversion.h          |    4 +-
 src/include/catalog/pg_attribute.h        |  129 +-
 src/include/catalog/pg_class.h            |    8 +-
 src/include/catalog/pg_language.h         |   14 +-
 src/include/catalog/pg_operator.h         | 1422 ++++++-----
 src/include/catalog/pg_proc.h             | 2754 ++++++++++-----------
 src/include/catalog/pg_shadow.h           |   18 +-
 src/include/catalog/pg_type.h             |  267 +-
 src/include/nodes/parsenodes.h            |    3 +-
 src/include/optimizer/cost.h              |    8 +-
 src/test/regress/expected/oidjoins.out    |   16 -
 src/test/regress/expected/rules.out       |    2 +-
 src/test/regress/expected/type_sanity.out |   29 +-
 src/test/regress/sql/oidjoins.sql         |    8 -
 src/test/regress/sql/type_sanity.sql      |   25 +-
 36 files changed, 2331 insertions(+), 2803 deletions(-)

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 1ec90fd5ae4..5ef29364533 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -1,6 +1,6 @@
 <!--
  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>
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index e2170dcc45d..2c618140c85 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -1,5 +1,5 @@
 <!--
-$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>
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index 1871da57e56..1431c32fc5a 100644
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -1,5 +1,5 @@
 <!--
-$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>
 
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index 042a8fd51d6..d4860cff80d 100644
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -1,5 +1,5 @@
 <!--
-$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
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 86651c6053e..07373663aeb 100644
--- 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 */
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index 189db5d77da..f6a54abe041 100644
--- 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 */
 
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 768c0237f9b..64af6ad3de6 100644
--- 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 */
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index d0f19968a1c..2a11474e9f5 100644
--- 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 */
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index b911ecacc5d..b3e53f9a2bf 100644
--- 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
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index a445b7d0e7b..29c3e550e74 100644
--- 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);
 }
diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c
index 1c4e5f3bee3..4d91ce48bf0 100644
--- 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 */
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 5dd70e9e55f..567b59dae80 100644
--- 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);
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index d387e17d5bb..a27babb32e3 100644
--- 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) */
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index fef3049a958..d464b5588c7 100644
--- 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 */
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 15798318e8d..b9990473802 100644
--- 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;
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 7a72e3afe25..419313c6101 100644
--- 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;
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 5647e9f7b1f..0dcecc9d5a5 100644
--- 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;
 			}
diff --git a/src/backend/utils/Gen_fmgrtab.sh b/src/backend/utils/Gen_fmgrtab.sh
index 9971823ab7f..074088e080d 100644
--- 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
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 0a378c47288..a9a65fc3893 100644
--- 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 */
 
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index f582da72c39..31a31f472b8 100644
--- 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, \
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index a173839b4d4..cb993355daa 100644
--- 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);
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 077da864a41..65facda7530 100644
--- 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
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index e68f298904c..462df4cc17e 100644
--- 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));
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index a33e63d7ef2..827769029f3 100644
--- 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("");
diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h
index 8f1b993b652..41d37075fe6 100644
--- 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
 
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 16c374ad201..b9c880c3547 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.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_operator.h,v 1.105 2002/06/20 20:29:44 momjian Exp $
+ * $Id: pg_operator.h,v 1.106 2002/07/24 19:11:12 petere Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -41,9 +41,7 @@ CATALOG(pg_operator)
 	NameData	oprname;		/* name of operator */
 	Oid			oprnamespace;	/* OID of namespace containing this oper */
 	int4		oprowner;		/* oper owner */
-	int2		oprprec;		/* precedence (not currently used) */
 	char		oprkind;		/* 'l', 'r', or 'b' */
-	bool		oprisleft;		/* left associative (not currently used) */
 	bool		oprcanhash;		/* can be used in hash join? */
 	Oid			oprleft;		/* left arg type, or 0 if 'l' oprkind */
 	Oid			oprright;		/* right arg type, or 0 if 'r' oprkind */
@@ -71,808 +69,806 @@ typedef FormData_pg_operator *Form_pg_operator;
  * ----------------
  */
 
-#define Natts_pg_operator				19
+#define Natts_pg_operator				17
 #define Anum_pg_operator_oprname		1
 #define Anum_pg_operator_oprnamespace	2
 #define Anum_pg_operator_oprowner		3
-#define Anum_pg_operator_oprprec		4
-#define Anum_pg_operator_oprkind		5
-#define Anum_pg_operator_oprisleft		6
-#define Anum_pg_operator_oprcanhash		7
-#define Anum_pg_operator_oprleft		8
-#define Anum_pg_operator_oprright		9
-#define Anum_pg_operator_oprresult		10
-#define Anum_pg_operator_oprcom			11
-#define Anum_pg_operator_oprnegate		12
-#define Anum_pg_operator_oprlsortop		13
-#define Anum_pg_operator_oprrsortop		14
-#define Anum_pg_operator_oprltcmpop		15
-#define Anum_pg_operator_oprgtcmpop		16
-#define Anum_pg_operator_oprcode		17
-#define Anum_pg_operator_oprrest		18
-#define Anum_pg_operator_oprjoin		19
+#define Anum_pg_operator_oprkind		4
+#define Anum_pg_operator_oprcanhash		5
+#define Anum_pg_operator_oprleft		6
+#define Anum_pg_operator_oprright		7
+#define Anum_pg_operator_oprresult		8
+#define Anum_pg_operator_oprcom			9
+#define Anum_pg_operator_oprnegate		10
+#define Anum_pg_operator_oprlsortop		11
+#define Anum_pg_operator_oprrsortop		12
+#define Anum_pg_operator_oprltcmpop		13
+#define Anum_pg_operator_oprgtcmpop		14
+#define Anum_pg_operator_oprcode		15
+#define Anum_pg_operator_oprrest		16
+#define Anum_pg_operator_oprjoin		17
 
 /* ----------------
  *		initial contents of pg_operator
  * ----------------
  */
 
-DATA(insert OID =  15 ( "="		   PGNSP PGUID 0 b t f  23  20  16 416  36  97 412  37  76 int48eq eqsel eqjoinsel ));
-DATA(insert OID =  36 ( "<>"	   PGNSP PGUID 0 b t f  23  20  16 417  15   0   0   0   0 int48ne neqsel neqjoinsel ));
-DATA(insert OID =  37 ( "<"		   PGNSP PGUID 0 b t f  23  20  16 419  82   0   0   0   0 int48lt scalarltsel scalarltjoinsel ));
-DATA(insert OID =  76 ( ">"		   PGNSP PGUID 0 b t f  23  20  16 418  80   0   0   0   0 int48gt scalargtsel scalargtjoinsel ));
-DATA(insert OID =  80 ( "<="	   PGNSP PGUID 0 b t f  23  20  16 430  76   0   0   0   0 int48le scalarltsel scalarltjoinsel ));
-DATA(insert OID =  82 ( ">="	   PGNSP PGUID 0 b t f  23  20  16 420  37   0   0   0   0 int48ge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID =  58 ( "<"		   PGNSP PGUID 0 b t f  16  16  16  59   1695   0   0   0   0 boollt scalarltsel scalarltjoinsel ));
-DATA(insert OID =  59 ( ">"		   PGNSP PGUID 0 b t f  16  16  16  58   1694   0   0   0   0 boolgt scalargtsel scalargtjoinsel ));
-DATA(insert OID =  85 ( "<>"	   PGNSP PGUID 0 b t f  16  16  16  85  91   0   0   0   0 boolne neqsel neqjoinsel ));
-DATA(insert OID =  91 ( "="		   PGNSP PGUID 0 b t t  16  16  16  91  85  58  58  58  59 booleq eqsel eqjoinsel ));
+DATA(insert OID =  15 ( "="		   PGNSP PGUID b f  23  20  16 416  36  97 412  37  76 int48eq eqsel eqjoinsel ));
+DATA(insert OID =  36 ( "<>"	   PGNSP PGUID b f  23  20  16 417  15   0   0   0   0 int48ne neqsel neqjoinsel ));
+DATA(insert OID =  37 ( "<"		   PGNSP PGUID b f  23  20  16 419  82   0   0   0   0 int48lt scalarltsel scalarltjoinsel ));
+DATA(insert OID =  76 ( ">"		   PGNSP PGUID b f  23  20  16 418  80   0   0   0   0 int48gt scalargtsel scalargtjoinsel ));
+DATA(insert OID =  80 ( "<="	   PGNSP PGUID b f  23  20  16 430  76   0   0   0   0 int48le scalarltsel scalarltjoinsel ));
+DATA(insert OID =  82 ( ">="	   PGNSP PGUID b f  23  20  16 420  37   0   0   0   0 int48ge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID =  58 ( "<"		   PGNSP PGUID b f  16  16  16  59   1695   0   0   0   0 boollt scalarltsel scalarltjoinsel ));
+DATA(insert OID =  59 ( ">"		   PGNSP PGUID b f  16  16  16  58   1694   0   0   0   0 boolgt scalargtsel scalargtjoinsel ));
+DATA(insert OID =  85 ( "<>"	   PGNSP PGUID b f  16  16  16  85  91   0   0   0   0 boolne neqsel neqjoinsel ));
+DATA(insert OID =  91 ( "="		   PGNSP PGUID b t  16  16  16  91  85  58  58  58  59 booleq eqsel eqjoinsel ));
 #define BooleanEqualOperator   91
-DATA(insert OID = 1694 (  "<="	   PGNSP PGUID 0 b t f  16  16  16 1695 59  0  0   0   0 boolle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1695 (  ">="	   PGNSP PGUID 0 b t f  16  16  16 1694 58  0  0   0   0 boolge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID =  92 ( "="		   PGNSP PGUID 0 b t t  18  18  16  92 630 631 631 631 633 chareq eqsel eqjoinsel ));
-DATA(insert OID =  93 ( "="		   PGNSP PGUID 0 b t t  19  19  16  93 643 660 660 660 662 nameeq eqsel eqjoinsel ));
-DATA(insert OID =  94 ( "="		   PGNSP PGUID 0 b t t  21  21  16  94 519  95  95  95 520 int2eq eqsel eqjoinsel ));
-DATA(insert OID =  95 ( "<"		   PGNSP PGUID 0 b t f  21  21  16 520 524   0   0   0   0 int2lt scalarltsel scalarltjoinsel ));
-DATA(insert OID =  96 ( "="		   PGNSP PGUID 0 b t t  23  23  16  96 518  97  97  97 521 int4eq eqsel eqjoinsel ));
-DATA(insert OID =  97 ( "<"		   PGNSP PGUID 0 b t f  23  23  16 521 525   0   0   0   0 int4lt scalarltsel scalarltjoinsel ));
-DATA(insert OID =  98 ( "="		   PGNSP PGUID 0 b t t  25  25  16  98 531 664 664 664 666 texteq eqsel eqjoinsel ));
-
-DATA(insert OID = 329 (  "="	   PGNSP PGUID 0 b t f  1000	1000  16  329 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 349 (  "="	   PGNSP PGUID 0 b t f  1001	1001  16  349 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 374 (  "="	   PGNSP PGUID 0 b t f  1002	1002  16  374 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 375 (  "="	   PGNSP PGUID 0 b t f  1003	1003  16  375 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 377 (  "="	   PGNSP PGUID 0 b t f  1005	1005  16  377 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 378 (  "="	   PGNSP PGUID 0 b t f  1006	1006  16  378 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 379 (  "="	   PGNSP PGUID 0 b t f  1007	1007  16  379 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 380 (  "="	   PGNSP PGUID 0 b t f  1008	1008  16  380 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 381 (  "="	   PGNSP PGUID 0 b t f  1009	1009  16  381 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 382 (  "="	   PGNSP PGUID 0 b t f  1028	1028  16  382 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 383 (  "="	   PGNSP PGUID 0 b t f  1010	1010  16  383 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 384 (  "="	   PGNSP PGUID 0 b t f  1011	1011  16  384 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 385 (  "="	   PGNSP PGUID 0 b t f  1012	1012  16  385 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 386 (  "="	   PGNSP PGUID 0 b t f  1013	1013  16  386 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 390 (  "="	   PGNSP PGUID 0 b t f  1017	1017  16  390 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 391 (  "="	   PGNSP PGUID 0 b t f  1018	1018  16  391 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 392 (  "="	   PGNSP PGUID 0 b t f  1019	1019  16  392 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 393 (  "="	   PGNSP PGUID 0 b t f  1020	1020  16  393 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 394 (  "="	   PGNSP PGUID 0 b t f  1021	1021  16  394 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 395 (  "="	   PGNSP PGUID 0 b t f  1022	1022  16  395 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 396 (  "="	   PGNSP PGUID 0 b t f  1023	1023  16  396 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 397 (  "="	   PGNSP PGUID 0 b t f  1024	1024  16  397 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 398 (  "="	   PGNSP PGUID 0 b t f  1025	1025  16  398 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 400 (  "="	   PGNSP PGUID 0 b t f  1027	1027  16  400 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 401 (  "="	   PGNSP PGUID 0 b t f  1034	1034  16  401 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-
-DATA(insert OID = 352 (  "="	   PGNSP PGUID 0 b t t  28  28  16 352   0   0   0   0   0 xideq eqsel eqjoinsel ));
-DATA(insert OID = 353 (  "="	   PGNSP PGUID 0 b t t  28  23  16   0   0   0   0   0   0 xideq eqsel eqjoinsel ));
-DATA(insert OID = 387 (  "="	   PGNSP PGUID 0 b t t  27  27  16 387   0   0   0   0   0 tideq eqsel eqjoinsel ));
+DATA(insert OID = 1694 (  "<="	   PGNSP PGUID b f  16  16  16 1695 59  0  0   0   0 boolle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1695 (  ">="	   PGNSP PGUID b f  16  16  16 1694 58  0  0   0   0 boolge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID =  92 ( "="		   PGNSP PGUID b t  18  18  16  92 630 631 631 631 633 chareq eqsel eqjoinsel ));
+DATA(insert OID =  93 ( "="		   PGNSP PGUID b t  19  19  16  93 643 660 660 660 662 nameeq eqsel eqjoinsel ));
+DATA(insert OID =  94 ( "="		   PGNSP PGUID b t  21  21  16  94 519  95  95  95 520 int2eq eqsel eqjoinsel ));
+DATA(insert OID =  95 ( "<"		   PGNSP PGUID b f  21  21  16 520 524   0   0   0   0 int2lt scalarltsel scalarltjoinsel ));
+DATA(insert OID =  96 ( "="		   PGNSP PGUID b t  23  23  16  96 518  97  97  97 521 int4eq eqsel eqjoinsel ));
+DATA(insert OID =  97 ( "<"		   PGNSP PGUID b f  23  23  16 521 525   0   0   0   0 int4lt scalarltsel scalarltjoinsel ));
+DATA(insert OID =  98 ( "="		   PGNSP PGUID b t  25  25  16  98 531 664 664 664 666 texteq eqsel eqjoinsel ));
+
+DATA(insert OID = 329 (  "="	   PGNSP PGUID b f  1000	1000  16  329 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 349 (  "="	   PGNSP PGUID b f  1001	1001  16  349 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 374 (  "="	   PGNSP PGUID b f  1002	1002  16  374 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 375 (  "="	   PGNSP PGUID b f  1003	1003  16  375 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 377 (  "="	   PGNSP PGUID b f  1005	1005  16  377 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 378 (  "="	   PGNSP PGUID b f  1006	1006  16  378 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 379 (  "="	   PGNSP PGUID b f  1007	1007  16  379 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 380 (  "="	   PGNSP PGUID b f  1008	1008  16  380 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 381 (  "="	   PGNSP PGUID b f  1009	1009  16  381 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 382 (  "="	   PGNSP PGUID b f  1028	1028  16  382 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 383 (  "="	   PGNSP PGUID b f  1010	1010  16  383 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 384 (  "="	   PGNSP PGUID b f  1011	1011  16  384 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 385 (  "="	   PGNSP PGUID b f  1012	1012  16  385 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 386 (  "="	   PGNSP PGUID b f  1013	1013  16  386 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 390 (  "="	   PGNSP PGUID b f  1017	1017  16  390 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 391 (  "="	   PGNSP PGUID b f  1018	1018  16  391 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 392 (  "="	   PGNSP PGUID b f  1019	1019  16  392 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 393 (  "="	   PGNSP PGUID b f  1020	1020  16  393 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 394 (  "="	   PGNSP PGUID b f  1021	1021  16  394 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 395 (  "="	   PGNSP PGUID b f  1022	1022  16  395 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 396 (  "="	   PGNSP PGUID b f  1023	1023  16  396 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 397 (  "="	   PGNSP PGUID b f  1024	1024  16  397 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 398 (  "="	   PGNSP PGUID b f  1025	1025  16  398 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 400 (  "="	   PGNSP PGUID b f  1027	1027  16  400 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 401 (  "="	   PGNSP PGUID b f  1034	1034  16  401 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+
+DATA(insert OID = 352 (  "="	   PGNSP PGUID b t  28  28  16 352   0   0   0   0   0 xideq eqsel eqjoinsel ));
+DATA(insert OID = 353 (  "="	   PGNSP PGUID b t  28  23  16   0   0   0   0   0   0 xideq eqsel eqjoinsel ));
+DATA(insert OID = 387 (  "="	   PGNSP PGUID b t  27  27  16 387   0   0   0   0   0 tideq eqsel eqjoinsel ));
 #define TIDEqualOperator   387
-DATA(insert OID = 388 (  "!"	   PGNSP PGUID 0 r t f  20   0  20   0   0   0   0   0   0 int8fac - - ));
-DATA(insert OID = 389 (  "!!"	   PGNSP PGUID 0 l t f   0  20  20   0   0   0   0   0   0 int8fac - - ));
-
-DATA(insert OID = 410 ( "="		   PGNSP PGUID 0 b t t  20  20  16 410 411 412 412 412 413 int8eq eqsel eqjoinsel ));
-DATA(insert OID = 411 ( "<>"	   PGNSP PGUID 0 b t f  20  20  16 411 410 0 0 0 0 int8ne neqsel neqjoinsel ));
-DATA(insert OID = 412 ( "<"		   PGNSP PGUID 0 b t f  20  20  16 413 415 0 0 0 0 int8lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 413 ( ">"		   PGNSP PGUID 0 b t f  20  20  16 412 414 0 0 0 0 int8gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 414 ( "<="	   PGNSP PGUID 0 b t f  20  20  16 415 413 0 0 0 0 int8le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 415 ( ">="	   PGNSP PGUID 0 b t f  20  20  16 414 412 0 0 0 0 int8ge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID = 416 ( "="		   PGNSP PGUID 0 b t f  20  23  16  15 417 412 97 418 419 int84eq eqsel eqjoinsel ));
-DATA(insert OID = 417 ( "<>"	   PGNSP PGUID 0 b t f  20  23  16  36 416 0 0 0 0 int84ne neqsel neqjoinsel ));
-DATA(insert OID = 418 ( "<"		   PGNSP PGUID 0 b t f  20  23  16  76 430 0 0 0 0 int84lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 419 ( ">"		   PGNSP PGUID 0 b t f  20  23  16  37 420 0 0 0 0 int84gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 420 ( "<="	   PGNSP PGUID 0 b t f  20  23  16  82 419 0 0 0 0 int84le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 430 ( ">="	   PGNSP PGUID 0 b t f  20  23  16  80 418 0 0 0 0 int84ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 439 (  "%"	   PGNSP PGUID 0 b t f  20  20  20   0   0 0 0 0 0 int8mod - - ));
-DATA(insert OID = 473 (  "@"	   PGNSP PGUID 0 l t f   0  20  20   0   0 0 0 0 0 int8abs - - ));
-
-DATA(insert OID = 484 (  "-"	   PGNSP PGUID 0 l t f   0  20  20   0   0   0   0   0   0 int8um - - ));
-DATA(insert OID = 485 (  "<<"	   PGNSP PGUID 0 b t f 604 604  16   0   0   0   0   0   0 poly_left positionsel positionjoinsel ));
-DATA(insert OID = 486 (  "&<"	   PGNSP PGUID 0 b t f 604 604  16   0   0   0   0   0   0 poly_overleft positionsel positionjoinsel ));
-DATA(insert OID = 487 (  "&>"	   PGNSP PGUID 0 b t f 604 604  16   0   0   0   0   0   0 poly_overright positionsel positionjoinsel ));
-DATA(insert OID = 488 (  ">>"	   PGNSP PGUID 0 b t f 604 604  16   0   0   0   0   0   0 poly_right positionsel positionjoinsel ));
-DATA(insert OID = 489 (  "@"	   PGNSP PGUID 0 b t f 604 604  16 490   0   0   0   0   0 poly_contained contsel contjoinsel ));
-DATA(insert OID = 490 (  "~"	   PGNSP PGUID 0 b t f 604 604  16 489   0   0   0   0   0 poly_contain contsel contjoinsel ));
-DATA(insert OID = 491 (  "~="	   PGNSP PGUID 0 b t f 604 604  16 491   0   0   0   0   0 poly_same eqsel eqjoinsel ));
-DATA(insert OID = 492 (  "&&"	   PGNSP PGUID 0 b t f 604 604  16 492   0   0   0   0   0 poly_overlap areasel areajoinsel ));
-DATA(insert OID = 493 (  "<<"	   PGNSP PGUID 0 b t f 603 603  16   0   0   0   0   0   0 box_left positionsel positionjoinsel ));
-DATA(insert OID = 494 (  "&<"	   PGNSP PGUID 0 b t f 603 603  16   0   0   0   0   0   0 box_overleft positionsel positionjoinsel ));
-DATA(insert OID = 495 (  "&>"	   PGNSP PGUID 0 b t f 603 603  16   0   0   0   0   0   0 box_overright positionsel positionjoinsel ));
-DATA(insert OID = 496 (  ">>"	   PGNSP PGUID 0 b t f 603 603  16   0   0   0   0   0   0 box_right positionsel positionjoinsel ));
-DATA(insert OID = 497 (  "@"	   PGNSP PGUID 0 b t f 603 603  16 498   0   0   0   0   0 box_contained contsel contjoinsel ));
-DATA(insert OID = 498 (  "~"	   PGNSP PGUID 0 b t f 603 603  16 497   0   0   0   0   0 box_contain contsel contjoinsel ));
-DATA(insert OID = 499 (  "~="	   PGNSP PGUID 0 b t f 603 603  16 499   0   0   0   0   0 box_same eqsel eqjoinsel ));
-DATA(insert OID = 500 (  "&&"	   PGNSP PGUID 0 b t f 603 603  16 500   0   0   0   0   0 box_overlap areasel areajoinsel ));
-DATA(insert OID = 501 (  ">="	   PGNSP PGUID 0 b t f 603 603  16 505 504   0   0   0   0 box_ge areasel areajoinsel ));
-DATA(insert OID = 502 (  ">"	   PGNSP PGUID 0 b t f 603 603  16 504 505   0   0   0   0 box_gt areasel areajoinsel ));
-DATA(insert OID = 503 (  "="	   PGNSP PGUID 0 b t f 603 603  16 503   0 504 504 504 502 box_eq eqsel eqjoinsel ));
-DATA(insert OID = 504 (  "<"	   PGNSP PGUID 0 b t f 603 603  16 502 501   0   0   0   0 box_lt areasel areajoinsel ));
-DATA(insert OID = 505 (  "<="	   PGNSP PGUID 0 b t f 603 603  16 501 502   0   0   0   0 box_le areasel areajoinsel ));
-DATA(insert OID = 506 (  ">^"	   PGNSP PGUID 0 b t f 600 600  16   0   0   0   0   0   0 point_above positionsel positionjoinsel ));
-DATA(insert OID = 507 (  "<<"	   PGNSP PGUID 0 b t f 600 600  16   0   0   0   0   0   0 point_left positionsel positionjoinsel ));
-DATA(insert OID = 508 (  ">>"	   PGNSP PGUID 0 b t f 600 600  16   0   0   0   0   0   0 point_right positionsel positionjoinsel ));
-DATA(insert OID = 509 (  "<^"	   PGNSP PGUID 0 b t f 600 600  16   0   0   0   0   0   0 point_below positionsel positionjoinsel ));
-DATA(insert OID = 510 (  "~="	   PGNSP PGUID 0 b t f 600 600  16 510   0   0   0   0   0 point_eq eqsel eqjoinsel ));
-DATA(insert OID = 511 (  "@"	   PGNSP PGUID 0 b t f 600 603  16   0   0   0   0   0   0 on_pb - - ));
-DATA(insert OID = 512 (  "@"	   PGNSP PGUID 0 b t f 600 602  16 755   0   0   0   0   0 on_ppath - - ));
-DATA(insert OID = 513 (  "@@"	   PGNSP PGUID 0 l t f   0 603 600   0   0   0   0   0   0 box_center - - ));
-DATA(insert OID = 514 (  "*"	   PGNSP PGUID 0 b t f  23  23  23 514   0   0   0   0   0 int4mul - - ));
-DATA(insert OID = 515 (  "!"	   PGNSP PGUID 0 r t f  23   0  23   0   0   0   0   0   0 int4fac - - ));
-DATA(insert OID = 516 (  "!!"	   PGNSP PGUID 0 l t f   0  23  23   0   0   0   0   0   0 int4fac - - ));
-DATA(insert OID = 517 (  "<->"	   PGNSP PGUID 0 b t f 600 600 701 517   0   0   0   0   0 point_distance - - ));
-DATA(insert OID = 518 (  "<>"	   PGNSP PGUID 0 b t f  23  23  16 518  96  0  0   0   0 int4ne neqsel neqjoinsel ));
-DATA(insert OID = 519 (  "<>"	   PGNSP PGUID 0 b t f  21  21  16 519  94  0  0   0   0 int2ne neqsel neqjoinsel ));
-DATA(insert OID = 520 (  ">"	   PGNSP PGUID 0 b t f  21  21  16  95 522  0  0   0   0 int2gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 521 (  ">"	   PGNSP PGUID 0 b t f  23  23  16  97 523  0  0   0   0 int4gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 522 (  "<="	   PGNSP PGUID 0 b t f  21  21  16 524 520  0  0   0   0 int2le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 523 (  "<="	   PGNSP PGUID 0 b t f  23  23  16 525 521  0  0   0   0 int4le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 524 (  ">="	   PGNSP PGUID 0 b t f  21  21  16 522  95  0  0   0   0 int2ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 525 (  ">="	   PGNSP PGUID 0 b t f  23  23  16 523  97  0  0   0   0 int4ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 526 (  "*"	   PGNSP PGUID 0 b t f  21  21  21 526   0  0  0   0   0 int2mul - - ));
-DATA(insert OID = 527 (  "/"	   PGNSP PGUID 0 b t f  21  21  21   0   0  0  0   0   0 int2div - - ));
-DATA(insert OID = 528 (  "/"	   PGNSP PGUID 0 b t f  23  23  23   0   0  0  0   0   0 int4div - - ));
-DATA(insert OID = 529 (  "%"	   PGNSP PGUID 0 b t f  21  21  21   0   0  0  0   0   0 int2mod - - ));
-DATA(insert OID = 530 (  "%"	   PGNSP PGUID 0 b t f  23  23  23   0   0  0  0   0   0 int4mod - - ));
-DATA(insert OID = 531 (  "<>"	   PGNSP PGUID 0 b t f  25  25  16 531  98	0	0   0   0 textne neqsel neqjoinsel ));
-DATA(insert OID = 532 (  "="	   PGNSP PGUID 0 b t f  21  23  16 533 538   95  97 534 536 int24eq eqsel eqjoinsel ));
-DATA(insert OID = 533 (  "="	   PGNSP PGUID 0 b t f  23  21  16 532 539   97  95 535 537 int42eq eqsel eqjoinsel ));
-DATA(insert OID = 534 (  "<"	   PGNSP PGUID 0 b t f  21  23  16 537 542  0  0   0   0 int24lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 535 (  "<"	   PGNSP PGUID 0 b t f  23  21  16 536 543  0  0   0   0 int42lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 536 (  ">"	   PGNSP PGUID 0 b t f  21  23  16 535 540  0  0   0   0 int24gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 537 (  ">"	   PGNSP PGUID 0 b t f  23  21  16 534 541  0  0   0   0 int42gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 538 (  "<>"	   PGNSP PGUID 0 b t f  21  23  16 539 532  0  0   0   0 int24ne neqsel neqjoinsel ));
-DATA(insert OID = 539 (  "<>"	   PGNSP PGUID 0 b t f  23  21  16 538 533  0  0   0   0 int42ne neqsel neqjoinsel ));
-DATA(insert OID = 540 (  "<="	   PGNSP PGUID 0 b t f  21  23  16 543 536  0  0   0   0 int24le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 541 (  "<="	   PGNSP PGUID 0 b t f  23  21  16 542 537  0  0   0   0 int42le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 542 (  ">="	   PGNSP PGUID 0 b t f  21  23  16 541 534  0  0   0   0 int24ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 543 (  ">="	   PGNSP PGUID 0 b t f  23  21  16 540 535  0  0   0   0 int42ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 544 (  "*"	   PGNSP PGUID 0 b t f  21  23  23 545   0   0   0   0   0 int24mul - - ));
-DATA(insert OID = 545 (  "*"	   PGNSP PGUID 0 b t f  23  21  23 544   0   0   0   0   0 int42mul - - ));
-DATA(insert OID = 546 (  "/"	   PGNSP PGUID 0 b t f  21  23  23   0   0   0   0   0   0 int24div - - ));
-DATA(insert OID = 547 (  "/"	   PGNSP PGUID 0 b t f  23  21  23   0   0   0   0   0   0 int42div - - ));
-DATA(insert OID = 548 (  "%"	   PGNSP PGUID 0 b t f  21  23  23   0   0   0   0   0   0 int24mod - - ));
-DATA(insert OID = 549 (  "%"	   PGNSP PGUID 0 b t f  23  21  23   0   0   0   0   0   0 int42mod - - ));
-DATA(insert OID = 550 (  "+"	   PGNSP PGUID 0 b t f  21  21  21 550   0   0   0   0   0 int2pl - - ));
-DATA(insert OID = 551 (  "+"	   PGNSP PGUID 0 b t f  23  23  23 551   0   0   0   0   0 int4pl - - ));
-DATA(insert OID = 552 (  "+"	   PGNSP PGUID 0 b t f  21  23  23 553   0   0   0   0   0 int24pl - - ));
-DATA(insert OID = 553 (  "+"	   PGNSP PGUID 0 b t f  23  21  23 552   0   0   0   0   0 int42pl - - ));
-DATA(insert OID = 554 (  "-"	   PGNSP PGUID 0 b t f  21  21  21   0   0   0   0   0   0 int2mi - - ));
-DATA(insert OID = 555 (  "-"	   PGNSP PGUID 0 b t f  23  23  23   0   0   0   0   0   0 int4mi - - ));
-DATA(insert OID = 556 (  "-"	   PGNSP PGUID 0 b t f  21  23  23   0   0   0   0   0   0 int24mi - - ));
-DATA(insert OID = 557 (  "-"	   PGNSP PGUID 0 b t f  23  21  23   0   0   0   0   0   0 int42mi - - ));
-DATA(insert OID = 558 (  "-"	   PGNSP PGUID 0 l t f   0  23  23   0   0   0   0   0   0 int4um - - ));
-DATA(insert OID = 559 (  "-"	   PGNSP PGUID 0 l t f   0  21  21   0   0   0   0   0   0 int2um - - ));
-DATA(insert OID = 560 (  "="	   PGNSP PGUID 0 b t t 702 702  16 560 561 562 562 562 563 abstimeeq eqsel eqjoinsel ));
-DATA(insert OID = 561 (  "<>"	   PGNSP PGUID 0 b t f 702 702  16 561 560 0 0 0 0 abstimene neqsel neqjoinsel ));
-DATA(insert OID = 562 (  "<"	   PGNSP PGUID 0 b t f 702 702  16 563 565 0 0 0 0 abstimelt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 563 (  ">"	   PGNSP PGUID 0 b t f 702 702  16 562 564 0 0 0 0 abstimegt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 564 (  "<="	   PGNSP PGUID 0 b t f 702 702  16 565 563 0 0 0 0 abstimele scalarltsel scalarltjoinsel ));
-DATA(insert OID = 565 (  ">="	   PGNSP PGUID 0 b t f 702 702  16 564 562 0 0 0 0 abstimege scalargtsel scalargtjoinsel ));
-DATA(insert OID = 566 (  "="	   PGNSP PGUID 0 b t t 703 703  16 566 567 568 568 568 569 reltimeeq eqsel eqjoinsel ));
-DATA(insert OID = 567 (  "<>"	   PGNSP PGUID 0 b t f 703 703  16 567 566 0 0 0 0 reltimene neqsel neqjoinsel ));
-DATA(insert OID = 568 (  "<"	   PGNSP PGUID 0 b t f 703 703  16 569 571 0 0 0 0 reltimelt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 569 (  ">"	   PGNSP PGUID 0 b t f 703 703  16 568 570 0 0 0 0 reltimegt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 570 (  "<="	   PGNSP PGUID 0 b t f 703 703  16 571 569 0 0 0 0 reltimele scalarltsel scalarltjoinsel ));
-DATA(insert OID = 571 (  ">="	   PGNSP PGUID 0 b t f 703 703  16 570 568 0 0 0 0 reltimege scalargtsel scalargtjoinsel ));
-DATA(insert OID = 572 (  "~="	   PGNSP PGUID 0 b t f 704 704  16 572   0   0   0   0   0 tintervalsame eqsel eqjoinsel ));
-DATA(insert OID = 573 (  "<<"	   PGNSP PGUID 0 b t f 704 704  16   0   0   0   0   0   0 tintervalct - - ));
-DATA(insert OID = 574 (  "&&"	   PGNSP PGUID 0 b t f 704 704  16 574   0   0   0   0   0 tintervalov - - ));
-DATA(insert OID = 575 (  "#="	   PGNSP PGUID 0 b t f 704 703  16   0 576   0   0   0   0 tintervalleneq - - ));
-DATA(insert OID = 576 (  "#<>"	   PGNSP PGUID 0 b t f 704 703  16   0 575   0   0   0   0 tintervallenne - - ));
-DATA(insert OID = 577 (  "#<"	   PGNSP PGUID 0 b t f 704 703  16   0 580   0   0   0   0 tintervallenlt - - ));
-DATA(insert OID = 578 (  "#>"	   PGNSP PGUID 0 b t f 704 703  16   0 579   0   0   0   0 tintervallengt - - ));
-DATA(insert OID = 579 (  "#<="	   PGNSP PGUID 0 b t f 704 703  16   0 578   0   0   0   0 tintervallenle - - ));
-DATA(insert OID = 580 (  "#>="	   PGNSP PGUID 0 b t f 704 703  16   0 577   0   0   0   0 tintervallenge - - ));
-DATA(insert OID = 581 (  "+"	   PGNSP PGUID 0 b t f 702 703 702   0   0 0 0 0 0 timepl - - ));
-DATA(insert OID = 582 (  "-"	   PGNSP PGUID 0 b t f 702 703 702   0   0 0 0 0 0 timemi - - ));
-DATA(insert OID = 583 (  "<?>"	   PGNSP PGUID 0 b t f 702 704  16   0   0   0   0   0   0 intinterval - - ));
-DATA(insert OID = 584 (  "-"	   PGNSP PGUID 0 l t f   0 700 700   0   0   0   0   0   0 float4um - - ));
-DATA(insert OID = 585 (  "-"	   PGNSP PGUID 0 l t f   0 701 701   0   0   0   0   0   0 float8um - - ));
-DATA(insert OID = 586 (  "+"	   PGNSP PGUID 0 b t f 700 700 700 586   0   0   0   0   0 float4pl - - ));
-DATA(insert OID = 587 (  "-"	   PGNSP PGUID 0 b t f 700 700 700   0   0   0   0   0   0 float4mi - - ));
-DATA(insert OID = 588 (  "/"	   PGNSP PGUID 0 b t f 700 700 700   0   0   0   0   0   0 float4div - - ));
-DATA(insert OID = 589 (  "*"	   PGNSP PGUID 0 b t f 700 700 700 589   0   0   0   0   0 float4mul - - ));
-DATA(insert OID = 590 (  "@"	   PGNSP PGUID 0 l t f   0 700 700   0   0   0   0   0   0 float4abs - - ));
-DATA(insert OID = 591 (  "+"	   PGNSP PGUID 0 b t f 701 701 701 591   0   0   0   0   0 float8pl - - ));
-DATA(insert OID = 592 (  "-"	   PGNSP PGUID 0 b t f 701 701 701   0   0   0   0   0   0 float8mi - - ));
-DATA(insert OID = 593 (  "/"	   PGNSP PGUID 0 b t f 701 701 701   0   0   0   0   0   0 float8div - - ));
-DATA(insert OID = 594 (  "*"	   PGNSP PGUID 0 b t f 701 701 701 594   0   0   0   0   0 float8mul - - ));
-DATA(insert OID = 595 (  "@"	   PGNSP PGUID 0 l t f   0 701 701   0   0   0   0   0   0 float8abs - - ));
-DATA(insert OID = 596 (  "|/"	   PGNSP PGUID 0 l t f   0 701 701   0   0   0   0   0   0 dsqrt - - ));
-DATA(insert OID = 597 (  "||/"	   PGNSP PGUID 0 l t f   0 701 701   0   0   0   0   0   0 dcbrt - - ));
-DATA(insert OID = 598 (  "%"	   PGNSP PGUID 0 l t f   0 701 701   0   0   0   0   0   0 dtrunc - - ));
-DATA(insert OID = 599 (  "%"	   PGNSP PGUID 0 r t f 701   0 701   0   0   0   0   0   0 dround - - ));
-DATA(insert OID = 1284 (  "|"	   PGNSP PGUID 0 l t f   0 704 702	0  0   0   0   0   0 tintervalstart - - ));
-DATA(insert OID = 606 (  "<#>"	   PGNSP PGUID 0 b t f 702 702 704	0  0   0   0   0   0 mktinterval - - ));
-DATA(insert OID = 607 (  "="	   PGNSP PGUID 0 b t t  26  26  16 607 608 609 609 609 610 oideq eqsel eqjoinsel ));
+DATA(insert OID = 388 (  "!"	   PGNSP PGUID r f  20   0  20   0   0   0   0   0   0 int8fac - - ));
+DATA(insert OID = 389 (  "!!"	   PGNSP PGUID l f   0  20  20   0   0   0   0   0   0 int8fac - - ));
+
+DATA(insert OID = 410 ( "="		   PGNSP PGUID b t  20  20  16 410 411 412 412 412 413 int8eq eqsel eqjoinsel ));
+DATA(insert OID = 411 ( "<>"	   PGNSP PGUID b f  20  20  16 411 410 0 0 0 0 int8ne neqsel neqjoinsel ));
+DATA(insert OID = 412 ( "<"		   PGNSP PGUID b f  20  20  16 413 415 0 0 0 0 int8lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 413 ( ">"		   PGNSP PGUID b f  20  20  16 412 414 0 0 0 0 int8gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 414 ( "<="	   PGNSP PGUID b f  20  20  16 415 413 0 0 0 0 int8le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 415 ( ">="	   PGNSP PGUID b f  20  20  16 414 412 0 0 0 0 int8ge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID = 416 ( "="		   PGNSP PGUID b f  20  23  16  15 417 412 97 418 419 int84eq eqsel eqjoinsel ));
+DATA(insert OID = 417 ( "<>"	   PGNSP PGUID b f  20  23  16  36 416 0 0 0 0 int84ne neqsel neqjoinsel ));
+DATA(insert OID = 418 ( "<"		   PGNSP PGUID b f  20  23  16  76 430 0 0 0 0 int84lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 419 ( ">"		   PGNSP PGUID b f  20  23  16  37 420 0 0 0 0 int84gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 420 ( "<="	   PGNSP PGUID b f  20  23  16  82 419 0 0 0 0 int84le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 430 ( ">="	   PGNSP PGUID b f  20  23  16  80 418 0 0 0 0 int84ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 439 (  "%"	   PGNSP PGUID b f  20  20  20   0   0 0 0 0 0 int8mod - - ));
+DATA(insert OID = 473 (  "@"	   PGNSP PGUID l f   0  20  20   0   0 0 0 0 0 int8abs - - ));
+
+DATA(insert OID = 484 (  "-"	   PGNSP PGUID l f   0  20  20   0   0   0   0   0   0 int8um - - ));
+DATA(insert OID = 485 (  "<<"	   PGNSP PGUID b f 604 604  16   0   0   0   0   0   0 poly_left positionsel positionjoinsel ));
+DATA(insert OID = 486 (  "&<"	   PGNSP PGUID b f 604 604  16   0   0   0   0   0   0 poly_overleft positionsel positionjoinsel ));
+DATA(insert OID = 487 (  "&>"	   PGNSP PGUID b f 604 604  16   0   0   0   0   0   0 poly_overright positionsel positionjoinsel ));
+DATA(insert OID = 488 (  ">>"	   PGNSP PGUID b f 604 604  16   0   0   0   0   0   0 poly_right positionsel positionjoinsel ));
+DATA(insert OID = 489 (  "@"	   PGNSP PGUID b f 604 604  16 490   0   0   0   0   0 poly_contained contsel contjoinsel ));
+DATA(insert OID = 490 (  "~"	   PGNSP PGUID b f 604 604  16 489   0   0   0   0   0 poly_contain contsel contjoinsel ));
+DATA(insert OID = 491 (  "~="	   PGNSP PGUID b f 604 604  16 491   0   0   0   0   0 poly_same eqsel eqjoinsel ));
+DATA(insert OID = 492 (  "&&"	   PGNSP PGUID b f 604 604  16 492   0   0   0   0   0 poly_overlap areasel areajoinsel ));
+DATA(insert OID = 493 (  "<<"	   PGNSP PGUID b f 603 603  16   0   0   0   0   0   0 box_left positionsel positionjoinsel ));
+DATA(insert OID = 494 (  "&<"	   PGNSP PGUID b f 603 603  16   0   0   0   0   0   0 box_overleft positionsel positionjoinsel ));
+DATA(insert OID = 495 (  "&>"	   PGNSP PGUID b f 603 603  16   0   0   0   0   0   0 box_overright positionsel positionjoinsel ));
+DATA(insert OID = 496 (  ">>"	   PGNSP PGUID b f 603 603  16   0   0   0   0   0   0 box_right positionsel positionjoinsel ));
+DATA(insert OID = 497 (  "@"	   PGNSP PGUID b f 603 603  16 498   0   0   0   0   0 box_contained contsel contjoinsel ));
+DATA(insert OID = 498 (  "~"	   PGNSP PGUID b f 603 603  16 497   0   0   0   0   0 box_contain contsel contjoinsel ));
+DATA(insert OID = 499 (  "~="	   PGNSP PGUID b f 603 603  16 499   0   0   0   0   0 box_same eqsel eqjoinsel ));
+DATA(insert OID = 500 (  "&&"	   PGNSP PGUID b f 603 603  16 500   0   0   0   0   0 box_overlap areasel areajoinsel ));
+DATA(insert OID = 501 (  ">="	   PGNSP PGUID b f 603 603  16 505 504   0   0   0   0 box_ge areasel areajoinsel ));
+DATA(insert OID = 502 (  ">"	   PGNSP PGUID b f 603 603  16 504 505   0   0   0   0 box_gt areasel areajoinsel ));
+DATA(insert OID = 503 (  "="	   PGNSP PGUID b f 603 603  16 503   0 504 504 504 502 box_eq eqsel eqjoinsel ));
+DATA(insert OID = 504 (  "<"	   PGNSP PGUID b f 603 603  16 502 501   0   0   0   0 box_lt areasel areajoinsel ));
+DATA(insert OID = 505 (  "<="	   PGNSP PGUID b f 603 603  16 501 502   0   0   0   0 box_le areasel areajoinsel ));
+DATA(insert OID = 506 (  ">^"	   PGNSP PGUID b f 600 600  16   0   0   0   0   0   0 point_above positionsel positionjoinsel ));
+DATA(insert OID = 507 (  "<<"	   PGNSP PGUID b f 600 600  16   0   0   0   0   0   0 point_left positionsel positionjoinsel ));
+DATA(insert OID = 508 (  ">>"	   PGNSP PGUID b f 600 600  16   0   0   0   0   0   0 point_right positionsel positionjoinsel ));
+DATA(insert OID = 509 (  "<^"	   PGNSP PGUID b f 600 600  16   0   0   0   0   0   0 point_below positionsel positionjoinsel ));
+DATA(insert OID = 510 (  "~="	   PGNSP PGUID b f 600 600  16 510   0   0   0   0   0 point_eq eqsel eqjoinsel ));
+DATA(insert OID = 511 (  "@"	   PGNSP PGUID b f 600 603  16   0   0   0   0   0   0 on_pb - - ));
+DATA(insert OID = 512 (  "@"	   PGNSP PGUID b f 600 602  16 755   0   0   0   0   0 on_ppath - - ));
+DATA(insert OID = 513 (  "@@"	   PGNSP PGUID l f   0 603 600   0   0   0   0   0   0 box_center - - ));
+DATA(insert OID = 514 (  "*"	   PGNSP PGUID b f  23  23  23 514   0   0   0   0   0 int4mul - - ));
+DATA(insert OID = 515 (  "!"	   PGNSP PGUID r f  23   0  23   0   0   0   0   0   0 int4fac - - ));
+DATA(insert OID = 516 (  "!!"	   PGNSP PGUID l f   0  23  23   0   0   0   0   0   0 int4fac - - ));
+DATA(insert OID = 517 (  "<->"	   PGNSP PGUID b f 600 600 701 517   0   0   0   0   0 point_distance - - ));
+DATA(insert OID = 518 (  "<>"	   PGNSP PGUID b f  23  23  16 518  96  0  0   0   0 int4ne neqsel neqjoinsel ));
+DATA(insert OID = 519 (  "<>"	   PGNSP PGUID b f  21  21  16 519  94  0  0   0   0 int2ne neqsel neqjoinsel ));
+DATA(insert OID = 520 (  ">"	   PGNSP PGUID b f  21  21  16  95 522  0  0   0   0 int2gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 521 (  ">"	   PGNSP PGUID b f  23  23  16  97 523  0  0   0   0 int4gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 522 (  "<="	   PGNSP PGUID b f  21  21  16 524 520  0  0   0   0 int2le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 523 (  "<="	   PGNSP PGUID b f  23  23  16 525 521  0  0   0   0 int4le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 524 (  ">="	   PGNSP PGUID b f  21  21  16 522  95  0  0   0   0 int2ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 525 (  ">="	   PGNSP PGUID b f  23  23  16 523  97  0  0   0   0 int4ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 526 (  "*"	   PGNSP PGUID b f  21  21  21 526   0  0  0   0   0 int2mul - - ));
+DATA(insert OID = 527 (  "/"	   PGNSP PGUID b f  21  21  21   0   0  0  0   0   0 int2div - - ));
+DATA(insert OID = 528 (  "/"	   PGNSP PGUID b f  23  23  23   0   0  0  0   0   0 int4div - - ));
+DATA(insert OID = 529 (  "%"	   PGNSP PGUID b f  21  21  21   0   0  0  0   0   0 int2mod - - ));
+DATA(insert OID = 530 (  "%"	   PGNSP PGUID b f  23  23  23   0   0  0  0   0   0 int4mod - - ));
+DATA(insert OID = 531 (  "<>"	   PGNSP PGUID b f  25  25  16 531  98	0	0   0   0 textne neqsel neqjoinsel ));
+DATA(insert OID = 532 (  "="	   PGNSP PGUID b f  21  23  16 533 538   95  97 534 536 int24eq eqsel eqjoinsel ));
+DATA(insert OID = 533 (  "="	   PGNSP PGUID b f  23  21  16 532 539   97  95 535 537 int42eq eqsel eqjoinsel ));
+DATA(insert OID = 534 (  "<"	   PGNSP PGUID b f  21  23  16 537 542  0  0   0   0 int24lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 535 (  "<"	   PGNSP PGUID b f  23  21  16 536 543  0  0   0   0 int42lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 536 (  ">"	   PGNSP PGUID b f  21  23  16 535 540  0  0   0   0 int24gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 537 (  ">"	   PGNSP PGUID b f  23  21  16 534 541  0  0   0   0 int42gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 538 (  "<>"	   PGNSP PGUID b f  21  23  16 539 532  0  0   0   0 int24ne neqsel neqjoinsel ));
+DATA(insert OID = 539 (  "<>"	   PGNSP PGUID b f  23  21  16 538 533  0  0   0   0 int42ne neqsel neqjoinsel ));
+DATA(insert OID = 540 (  "<="	   PGNSP PGUID b f  21  23  16 543 536  0  0   0   0 int24le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 541 (  "<="	   PGNSP PGUID b f  23  21  16 542 537  0  0   0   0 int42le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 542 (  ">="	   PGNSP PGUID b f  21  23  16 541 534  0  0   0   0 int24ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 543 (  ">="	   PGNSP PGUID b f  23  21  16 540 535  0  0   0   0 int42ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 544 (  "*"	   PGNSP PGUID b f  21  23  23 545   0   0   0   0   0 int24mul - - ));
+DATA(insert OID = 545 (  "*"	   PGNSP PGUID b f  23  21  23 544   0   0   0   0   0 int42mul - - ));
+DATA(insert OID = 546 (  "/"	   PGNSP PGUID b f  21  23  23   0   0   0   0   0   0 int24div - - ));
+DATA(insert OID = 547 (  "/"	   PGNSP PGUID b f  23  21  23   0   0   0   0   0   0 int42div - - ));
+DATA(insert OID = 548 (  "%"	   PGNSP PGUID b f  21  23  23   0   0   0   0   0   0 int24mod - - ));
+DATA(insert OID = 549 (  "%"	   PGNSP PGUID b f  23  21  23   0   0   0   0   0   0 int42mod - - ));
+DATA(insert OID = 550 (  "+"	   PGNSP PGUID b f  21  21  21 550   0   0   0   0   0 int2pl - - ));
+DATA(insert OID = 551 (  "+"	   PGNSP PGUID b f  23  23  23 551   0   0   0   0   0 int4pl - - ));
+DATA(insert OID = 552 (  "+"	   PGNSP PGUID b f  21  23  23 553   0   0   0   0   0 int24pl - - ));
+DATA(insert OID = 553 (  "+"	   PGNSP PGUID b f  23  21  23 552   0   0   0   0   0 int42pl - - ));
+DATA(insert OID = 554 (  "-"	   PGNSP PGUID b f  21  21  21   0   0   0   0   0   0 int2mi - - ));
+DATA(insert OID = 555 (  "-"	   PGNSP PGUID b f  23  23  23   0   0   0   0   0   0 int4mi - - ));
+DATA(insert OID = 556 (  "-"	   PGNSP PGUID b f  21  23  23   0   0   0   0   0   0 int24mi - - ));
+DATA(insert OID = 557 (  "-"	   PGNSP PGUID b f  23  21  23   0   0   0   0   0   0 int42mi - - ));
+DATA(insert OID = 558 (  "-"	   PGNSP PGUID l f   0  23  23   0   0   0   0   0   0 int4um - - ));
+DATA(insert OID = 559 (  "-"	   PGNSP PGUID l f   0  21  21   0   0   0   0   0   0 int2um - - ));
+DATA(insert OID = 560 (  "="	   PGNSP PGUID b t 702 702  16 560 561 562 562 562 563 abstimeeq eqsel eqjoinsel ));
+DATA(insert OID = 561 (  "<>"	   PGNSP PGUID b f 702 702  16 561 560 0 0 0 0 abstimene neqsel neqjoinsel ));
+DATA(insert OID = 562 (  "<"	   PGNSP PGUID b f 702 702  16 563 565 0 0 0 0 abstimelt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 563 (  ">"	   PGNSP PGUID b f 702 702  16 562 564 0 0 0 0 abstimegt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 564 (  "<="	   PGNSP PGUID b f 702 702  16 565 563 0 0 0 0 abstimele scalarltsel scalarltjoinsel ));
+DATA(insert OID = 565 (  ">="	   PGNSP PGUID b f 702 702  16 564 562 0 0 0 0 abstimege scalargtsel scalargtjoinsel ));
+DATA(insert OID = 566 (  "="	   PGNSP PGUID b t 703 703  16 566 567 568 568 568 569 reltimeeq eqsel eqjoinsel ));
+DATA(insert OID = 567 (  "<>"	   PGNSP PGUID b f 703 703  16 567 566 0 0 0 0 reltimene neqsel neqjoinsel ));
+DATA(insert OID = 568 (  "<"	   PGNSP PGUID b f 703 703  16 569 571 0 0 0 0 reltimelt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 569 (  ">"	   PGNSP PGUID b f 703 703  16 568 570 0 0 0 0 reltimegt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 570 (  "<="	   PGNSP PGUID b f 703 703  16 571 569 0 0 0 0 reltimele scalarltsel scalarltjoinsel ));
+DATA(insert OID = 571 (  ">="	   PGNSP PGUID b f 703 703  16 570 568 0 0 0 0 reltimege scalargtsel scalargtjoinsel ));
+DATA(insert OID = 572 (  "~="	   PGNSP PGUID b f 704 704  16 572   0   0   0   0   0 tintervalsame eqsel eqjoinsel ));
+DATA(insert OID = 573 (  "<<"	   PGNSP PGUID b f 704 704  16   0   0   0   0   0   0 tintervalct - - ));
+DATA(insert OID = 574 (  "&&"	   PGNSP PGUID b f 704 704  16 574   0   0   0   0   0 tintervalov - - ));
+DATA(insert OID = 575 (  "#="	   PGNSP PGUID b f 704 703  16   0 576   0   0   0   0 tintervalleneq - - ));
+DATA(insert OID = 576 (  "#<>"	   PGNSP PGUID b f 704 703  16   0 575   0   0   0   0 tintervallenne - - ));
+DATA(insert OID = 577 (  "#<"	   PGNSP PGUID b f 704 703  16   0 580   0   0   0   0 tintervallenlt - - ));
+DATA(insert OID = 578 (  "#>"	   PGNSP PGUID b f 704 703  16   0 579   0   0   0   0 tintervallengt - - ));
+DATA(insert OID = 579 (  "#<="	   PGNSP PGUID b f 704 703  16   0 578   0   0   0   0 tintervallenle - - ));
+DATA(insert OID = 580 (  "#>="	   PGNSP PGUID b f 704 703  16   0 577   0   0   0   0 tintervallenge - - ));
+DATA(insert OID = 581 (  "+"	   PGNSP PGUID b f 702 703 702   0   0 0 0 0 0 timepl - - ));
+DATA(insert OID = 582 (  "-"	   PGNSP PGUID b f 702 703 702   0   0 0 0 0 0 timemi - - ));
+DATA(insert OID = 583 (  "<?>"	   PGNSP PGUID b f 702 704  16   0   0   0   0   0   0 intinterval - - ));
+DATA(insert OID = 584 (  "-"	   PGNSP PGUID l f   0 700 700   0   0   0   0   0   0 float4um - - ));
+DATA(insert OID = 585 (  "-"	   PGNSP PGUID l f   0 701 701   0   0   0   0   0   0 float8um - - ));
+DATA(insert OID = 586 (  "+"	   PGNSP PGUID b f 700 700 700 586   0   0   0   0   0 float4pl - - ));
+DATA(insert OID = 587 (  "-"	   PGNSP PGUID b f 700 700 700   0   0   0   0   0   0 float4mi - - ));
+DATA(insert OID = 588 (  "/"	   PGNSP PGUID b f 700 700 700   0   0   0   0   0   0 float4div - - ));
+DATA(insert OID = 589 (  "*"	   PGNSP PGUID b f 700 700 700 589   0   0   0   0   0 float4mul - - ));
+DATA(insert OID = 590 (  "@"	   PGNSP PGUID l f   0 700 700   0   0   0   0   0   0 float4abs - - ));
+DATA(insert OID = 591 (  "+"	   PGNSP PGUID b f 701 701 701 591   0   0   0   0   0 float8pl - - ));
+DATA(insert OID = 592 (  "-"	   PGNSP PGUID b f 701 701 701   0   0   0   0   0   0 float8mi - - ));
+DATA(insert OID = 593 (  "/"	   PGNSP PGUID b f 701 701 701   0   0   0   0   0   0 float8div - - ));
+DATA(insert OID = 594 (  "*"	   PGNSP PGUID b f 701 701 701 594   0   0   0   0   0 float8mul - - ));
+DATA(insert OID = 595 (  "@"	   PGNSP PGUID l f   0 701 701   0   0   0   0   0   0 float8abs - - ));
+DATA(insert OID = 596 (  "|/"	   PGNSP PGUID l f   0 701 701   0   0   0   0   0   0 dsqrt - - ));
+DATA(insert OID = 597 (  "||/"	   PGNSP PGUID l f   0 701 701   0   0   0   0   0   0 dcbrt - - ));
+DATA(insert OID = 598 (  "%"	   PGNSP PGUID l f   0 701 701   0   0   0   0   0   0 dtrunc - - ));
+DATA(insert OID = 599 (  "%"	   PGNSP PGUID r f 701   0 701   0   0   0   0   0   0 dround - - ));
+DATA(insert OID = 1284 (  "|"	   PGNSP PGUID l f   0 704 702	0  0   0   0   0   0 tintervalstart - - ));
+DATA(insert OID = 606 (  "<#>"	   PGNSP PGUID b f 702 702 704	0  0   0   0   0   0 mktinterval - - ));
+DATA(insert OID = 607 (  "="	   PGNSP PGUID b t  26  26  16 607 608 609 609 609 610 oideq eqsel eqjoinsel ));
 #define MIN_OIDCMP 607			/* used by cache code */
-DATA(insert OID = 608 (  "<>"	   PGNSP PGUID 0 b t f  26  26  16 608 607  0  0   0   0 oidne neqsel neqjoinsel ));
-DATA(insert OID = 609 (  "<"	   PGNSP PGUID 0 b t f  26  26  16 610 612  0  0   0   0 oidlt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 610 (  ">"	   PGNSP PGUID 0 b t f  26  26  16 609 611  0  0   0   0 oidgt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 611 (  "<="	   PGNSP PGUID 0 b t f  26  26  16 612 610  0  0   0   0 oidle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 612 (  ">="	   PGNSP PGUID 0 b t f  26  26  16 611 609  0  0   0   0 oidge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 608 (  "<>"	   PGNSP PGUID b f  26  26  16 608 607  0  0   0   0 oidne neqsel neqjoinsel ));
+DATA(insert OID = 609 (  "<"	   PGNSP PGUID b f  26  26  16 610 612  0  0   0   0 oidlt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 610 (  ">"	   PGNSP PGUID b f  26  26  16 609 611  0  0   0   0 oidgt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 611 (  "<="	   PGNSP PGUID b f  26  26  16 612 610  0  0   0   0 oidle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 612 (  ">="	   PGNSP PGUID b f  26  26  16 611 609  0  0   0   0 oidge scalargtsel scalargtjoinsel ));
 #define MAX_OIDCMP 612			/* used by cache code */
 
-DATA(insert OID = 644 (  "<>"	   PGNSP PGUID 0 b t f  30  30  16 644 649   0   0   0   0 oidvectorne neqsel neqjoinsel ));
-DATA(insert OID = 645 (  "<"	   PGNSP PGUID 0 b t f  30  30  16 646 648   0   0   0   0 oidvectorlt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 646 (  ">"	   PGNSP PGUID 0 b t f  30  30  16 645 647   0   0   0   0 oidvectorgt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 647 (  "<="	   PGNSP PGUID 0 b t f  30  30  16 648 646   0   0   0   0 oidvectorle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 648 (  ">="	   PGNSP PGUID 0 b t f  30  30  16 647 645   0   0   0   0 oidvectorge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 649 (  "="	   PGNSP PGUID 0 b t t  30  30  16 649 644 645 645 645 646 oidvectoreq eqsel eqjoinsel ));
-
-DATA(insert OID = 613 (  "<->"	   PGNSP PGUID 0 b t f 600 628 701   0   0  0  0   0   0 dist_pl - - ));
-DATA(insert OID = 614 (  "<->"	   PGNSP PGUID 0 b t f 600 601 701   0   0  0  0   0   0 dist_ps - - ));
-DATA(insert OID = 615 (  "<->"	   PGNSP PGUID 0 b t f 600 603 701   0   0  0  0   0   0 dist_pb - - ));
-DATA(insert OID = 616 (  "<->"	   PGNSP PGUID 0 b t f 601 628 701   0   0  0  0   0   0 dist_sl - - ));
-DATA(insert OID = 617 (  "<->"	   PGNSP PGUID 0 b t f 601 603 701   0   0  0  0   0   0 dist_sb - - ));
-DATA(insert OID = 618 (  "<->"	   PGNSP PGUID 0 b t f 600 602 701   0   0  0  0   0   0 dist_ppath - - ));
-
-DATA(insert OID = 620 (  "="	   PGNSP PGUID 0 b t f  700  700	16 620 621	622 622 622 623 float4eq eqsel eqjoinsel ));
-DATA(insert OID = 621 (  "<>"	   PGNSP PGUID 0 b t f  700  700	16 621 620	0 0   0   0 float4ne neqsel neqjoinsel ));
-DATA(insert OID = 622 (  "<"	   PGNSP PGUID 0 b t f  700  700	16 623 625	0 0   0   0 float4lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 623 (  ">"	   PGNSP PGUID 0 b t f  700  700	16 622 624	0 0   0   0 float4gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 624 (  "<="	   PGNSP PGUID 0 b t f  700  700	16 625 623	0 0   0   0 float4le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 625 (  ">="	   PGNSP PGUID 0 b t f  700  700	16 624 622	0 0   0   0 float4ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 626 (  "!!="	   PGNSP PGUID 0 b t f  23   25	16 0   0	0	0   0   0	int4notin - - ));
-DATA(insert OID = 627 (  "!!="	   PGNSP PGUID 0 b t f  26   25	16 0   0	0	0   0   0	oidnotin - - ));
-DATA(insert OID = 630 (  "<>"	   PGNSP PGUID 0 b t f  18  18  16 630  92  0 0 0 0 charne neqsel neqjoinsel ));
-
-DATA(insert OID = 631 (  "<"	   PGNSP PGUID 0 b t f  18  18  16 633 634  0 0 0 0 charlt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 632 (  "<="	   PGNSP PGUID 0 b t f  18  18  16 634 633  0 0 0 0 charle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 633 (  ">"	   PGNSP PGUID 0 b t f  18  18  16 631 632  0 0 0 0 chargt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 634 (  ">="	   PGNSP PGUID 0 b t f  18  18  16 632 631  0 0 0 0 charge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID = 635 (  "+"	   PGNSP PGUID 0 b t f  18  18  18 0 0  0 0 0 0 charpl - - ));
-DATA(insert OID = 636 (  "-"	   PGNSP PGUID 0 b t f  18  18  18 0 0  0 0 0 0 charmi - - ));
-DATA(insert OID = 637 (  "*"	   PGNSP PGUID 0 b t f  18  18  18 0 0  0 0 0 0 charmul - - ));
-DATA(insert OID = 638 (  "/"	   PGNSP PGUID 0 b t f  18  18  18 0 0  0 0 0 0 chardiv - - ));
-
-DATA(insert OID = 639 (  "~"	   PGNSP PGUID 0 b t f  19  25  16 0 640	0 0   0   0 nameregexeq regexeqsel regexeqjoinsel ));
+DATA(insert OID = 644 (  "<>"	   PGNSP PGUID b f  30  30  16 644 649   0   0   0   0 oidvectorne neqsel neqjoinsel ));
+DATA(insert OID = 645 (  "<"	   PGNSP PGUID b f  30  30  16 646 648   0   0   0   0 oidvectorlt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 646 (  ">"	   PGNSP PGUID b f  30  30  16 645 647   0   0   0   0 oidvectorgt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 647 (  "<="	   PGNSP PGUID b f  30  30  16 648 646   0   0   0   0 oidvectorle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 648 (  ">="	   PGNSP PGUID b f  30  30  16 647 645   0   0   0   0 oidvectorge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 649 (  "="	   PGNSP PGUID b t  30  30  16 649 644 645 645 645 646 oidvectoreq eqsel eqjoinsel ));
+
+DATA(insert OID = 613 (  "<->"	   PGNSP PGUID b f 600 628 701   0   0  0  0   0   0 dist_pl - - ));
+DATA(insert OID = 614 (  "<->"	   PGNSP PGUID b f 600 601 701   0   0  0  0   0   0 dist_ps - - ));
+DATA(insert OID = 615 (  "<->"	   PGNSP PGUID b f 600 603 701   0   0  0  0   0   0 dist_pb - - ));
+DATA(insert OID = 616 (  "<->"	   PGNSP PGUID b f 601 628 701   0   0  0  0   0   0 dist_sl - - ));
+DATA(insert OID = 617 (  "<->"	   PGNSP PGUID b f 601 603 701   0   0  0  0   0   0 dist_sb - - ));
+DATA(insert OID = 618 (  "<->"	   PGNSP PGUID b f 600 602 701   0   0  0  0   0   0 dist_ppath - - ));
+
+DATA(insert OID = 620 (  "="	   PGNSP PGUID b f  700  700	16 620 621	622 622 622 623 float4eq eqsel eqjoinsel ));
+DATA(insert OID = 621 (  "<>"	   PGNSP PGUID b f  700  700	16 621 620	0 0   0   0 float4ne neqsel neqjoinsel ));
+DATA(insert OID = 622 (  "<"	   PGNSP PGUID b f  700  700	16 623 625	0 0   0   0 float4lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 623 (  ">"	   PGNSP PGUID b f  700  700	16 622 624	0 0   0   0 float4gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 624 (  "<="	   PGNSP PGUID b f  700  700	16 625 623	0 0   0   0 float4le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 625 (  ">="	   PGNSP PGUID b f  700  700	16 624 622	0 0   0   0 float4ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 626 (  "!!="	   PGNSP PGUID b f  23   25	16 0   0	0	0   0   0	int4notin - - ));
+DATA(insert OID = 627 (  "!!="	   PGNSP PGUID b f  26   25	16 0   0	0	0   0   0	oidnotin - - ));
+DATA(insert OID = 630 (  "<>"	   PGNSP PGUID b f  18  18  16 630  92  0 0 0 0 charne neqsel neqjoinsel ));
+
+DATA(insert OID = 631 (  "<"	   PGNSP PGUID b f  18  18  16 633 634  0 0 0 0 charlt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 632 (  "<="	   PGNSP PGUID b f  18  18  16 634 633  0 0 0 0 charle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 633 (  ">"	   PGNSP PGUID b f  18  18  16 631 632  0 0 0 0 chargt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 634 (  ">="	   PGNSP PGUID b f  18  18  16 632 631  0 0 0 0 charge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID = 635 (  "+"	   PGNSP PGUID b f  18  18  18 0 0  0 0 0 0 charpl - - ));
+DATA(insert OID = 636 (  "-"	   PGNSP PGUID b f  18  18  18 0 0  0 0 0 0 charmi - - ));
+DATA(insert OID = 637 (  "*"	   PGNSP PGUID b f  18  18  18 0 0  0 0 0 0 charmul - - ));
+DATA(insert OID = 638 (  "/"	   PGNSP PGUID b f  18  18  18 0 0  0 0 0 0 chardiv - - ));
+
+DATA(insert OID = 639 (  "~"	   PGNSP PGUID b f  19  25  16 0 640	0 0   0   0 nameregexeq regexeqsel regexeqjoinsel ));
 #define OID_NAME_REGEXEQ_OP		639
-DATA(insert OID = 640 (  "!~"	   PGNSP PGUID 0 b t f  19  25  16 0 639	0 0   0   0 nameregexne regexnesel regexnejoinsel ));
-DATA(insert OID = 641 (  "~"	   PGNSP PGUID 0 b t f  25  25  16 0 642	0 0   0   0 textregexeq regexeqsel regexeqjoinsel ));
+DATA(insert OID = 640 (  "!~"	   PGNSP PGUID b f  19  25  16 0 639	0 0   0   0 nameregexne regexnesel regexnejoinsel ));
+DATA(insert OID = 641 (  "~"	   PGNSP PGUID b f  25  25  16 0 642	0 0   0   0 textregexeq regexeqsel regexeqjoinsel ));
 #define OID_TEXT_REGEXEQ_OP		641
-DATA(insert OID = 642 (  "!~"	   PGNSP PGUID 0 b t f  25  25  16 0 641	0 0   0   0 textregexne regexnesel regexnejoinsel ));
-DATA(insert OID = 643 (  "<>"	   PGNSP PGUID 0 b t f  19  19  16 643 93 0 0 0 0 namene neqsel neqjoinsel ));
-DATA(insert OID = 654 (  "||"	   PGNSP PGUID 0 b t f  25  25  25   0 0	0 0   0   0 textcat - - ));
-
-DATA(insert OID = 660 (  "<"	   PGNSP PGUID 0 b t f  19  19  16 662 663  0 0 0 0 namelt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 661 (  "<="	   PGNSP PGUID 0 b t f  19  19  16 663 662  0 0 0 0 namele scalarltsel scalarltjoinsel ));
-DATA(insert OID = 662 (  ">"	   PGNSP PGUID 0 b t f  19  19  16 660 661  0 0 0 0 namegt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 663 (  ">="	   PGNSP PGUID 0 b t f  19  19  16 661 660  0 0 0 0 namege scalargtsel scalargtjoinsel ));
-DATA(insert OID = 664 (  "<"	   PGNSP PGUID 0 b t f  25  25  16 666 667  0 0 0 0 text_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 665 (  "<="	   PGNSP PGUID 0 b t f  25  25  16 667 666  0 0 0 0 text_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 666 (  ">"	   PGNSP PGUID 0 b t f  25  25  16 664 665  0 0 0 0 text_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 667 (  ">="	   PGNSP PGUID 0 b t f  25  25  16 665 664  0 0 0 0 text_ge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID = 670 (  "="	   PGNSP PGUID 0 b t f  701  701	16 670 671 672 672 672 674 float8eq eqsel eqjoinsel ));
-DATA(insert OID = 671 (  "<>"	   PGNSP PGUID 0 b t f  701  701	16 671 670	0 0   0   0 float8ne neqsel neqjoinsel ));
-DATA(insert OID = 672 (  "<"	   PGNSP PGUID 0 b t f  701  701	16 674 675	0 0   0   0 float8lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 673 (  "<="	   PGNSP PGUID 0 b t f  701  701	16 675 674	0 0   0   0 float8le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 674 (  ">"	   PGNSP PGUID 0 b t f  701  701	16 672 673	0 0   0   0 float8gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 675 (  ">="	   PGNSP PGUID 0 b t f  701  701	16 673 672	0 0   0   0 float8ge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID = 682 (  "@"	   PGNSP PGUID 0 l t f   0  21  21   0   0   0   0   0   0 int2abs - - ));
-DATA(insert OID = 684 (  "+"	   PGNSP PGUID 0 b t f  20  20  20 684   0   0   0   0   0 int8pl - - ));
-DATA(insert OID = 685 (  "-"	   PGNSP PGUID 0 b t f  20  20  20   0   0   0   0   0   0 int8mi - - ));
-DATA(insert OID = 686 (  "*"	   PGNSP PGUID 0 b t f  20  20  20 686   0   0   0   0   0 int8mul - - ));
-DATA(insert OID = 687 (  "/"	   PGNSP PGUID 0 b t f  20  20  20   0   0   0   0   0   0 int8div - - ));
-DATA(insert OID = 688 (  "+"	   PGNSP PGUID 0 b t f  20  23  20 692   0   0   0   0   0 int84pl - - ));
-DATA(insert OID = 689 (  "-"	   PGNSP PGUID 0 b t f  20  23  20   0   0   0   0   0   0 int84mi - - ));
-DATA(insert OID = 690 (  "*"	   PGNSP PGUID 0 b t f  20  23  20 694   0   0   0   0   0 int84mul - - ));
-DATA(insert OID = 691 (  "/"	   PGNSP PGUID 0 b t f  20  23  20   0   0   0   0   0   0 int84div - - ));
-DATA(insert OID = 692 (  "+"	   PGNSP PGUID 0 b t f  23  20  20 688   0   0   0   0   0 int48pl - - ));
-DATA(insert OID = 693 (  "-"	   PGNSP PGUID 0 b t f  23  20  20   0   0   0   0   0   0 int48mi - - ));
-DATA(insert OID = 694 (  "*"	   PGNSP PGUID 0 b t f  23  20  20 690   0   0   0   0   0 int48mul - - ));
-DATA(insert OID = 695 (  "/"	   PGNSP PGUID 0 b t f  23  20  20   0   0   0   0   0   0 int48div - - ));
-
-DATA(insert OID = 706 (  "<->"	   PGNSP PGUID 0 b t f 603 603 701 706   0  0  0   0   0 box_distance - - ));
-DATA(insert OID = 707 (  "<->"	   PGNSP PGUID 0 b t f 602 602 701 707   0  0  0   0   0 path_distance - - ));
-DATA(insert OID = 708 (  "<->"	   PGNSP PGUID 0 b t f 628 628 701 708   0  0  0   0   0 line_distance - - ));
-DATA(insert OID = 709 (  "<->"	   PGNSP PGUID 0 b t f 601 601 701 709   0  0  0   0   0 lseg_distance - - ));
-DATA(insert OID = 712 (  "<->"	   PGNSP PGUID 0 b t f 604 604 701 712   0  0  0   0   0 poly_distance - - ));
+DATA(insert OID = 642 (  "!~"	   PGNSP PGUID b f  25  25  16 0 641	0 0   0   0 textregexne regexnesel regexnejoinsel ));
+DATA(insert OID = 643 (  "<>"	   PGNSP PGUID b f  19  19  16 643 93 0 0 0 0 namene neqsel neqjoinsel ));
+DATA(insert OID = 654 (  "||"	   PGNSP PGUID b f  25  25  25   0 0	0 0   0   0 textcat - - ));
+
+DATA(insert OID = 660 (  "<"	   PGNSP PGUID b f  19  19  16 662 663  0 0 0 0 namelt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 661 (  "<="	   PGNSP PGUID b f  19  19  16 663 662  0 0 0 0 namele scalarltsel scalarltjoinsel ));
+DATA(insert OID = 662 (  ">"	   PGNSP PGUID b f  19  19  16 660 661  0 0 0 0 namegt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 663 (  ">="	   PGNSP PGUID b f  19  19  16 661 660  0 0 0 0 namege scalargtsel scalargtjoinsel ));
+DATA(insert OID = 664 (  "<"	   PGNSP PGUID b f  25  25  16 666 667  0 0 0 0 text_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 665 (  "<="	   PGNSP PGUID b f  25  25  16 667 666  0 0 0 0 text_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 666 (  ">"	   PGNSP PGUID b f  25  25  16 664 665  0 0 0 0 text_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 667 (  ">="	   PGNSP PGUID b f  25  25  16 665 664  0 0 0 0 text_ge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID = 670 (  "="	   PGNSP PGUID b f  701  701	16 670 671 672 672 672 674 float8eq eqsel eqjoinsel ));
+DATA(insert OID = 671 (  "<>"	   PGNSP PGUID b f  701  701	16 671 670	0 0   0   0 float8ne neqsel neqjoinsel ));
+DATA(insert OID = 672 (  "<"	   PGNSP PGUID b f  701  701	16 674 675	0 0   0   0 float8lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 673 (  "<="	   PGNSP PGUID b f  701  701	16 675 674	0 0   0   0 float8le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 674 (  ">"	   PGNSP PGUID b f  701  701	16 672 673	0 0   0   0 float8gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 675 (  ">="	   PGNSP PGUID b f  701  701	16 673 672	0 0   0   0 float8ge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID = 682 (  "@"	   PGNSP PGUID l f   0  21  21   0   0   0   0   0   0 int2abs - - ));
+DATA(insert OID = 684 (  "+"	   PGNSP PGUID b f  20  20  20 684   0   0   0   0   0 int8pl - - ));
+DATA(insert OID = 685 (  "-"	   PGNSP PGUID b f  20  20  20   0   0   0   0   0   0 int8mi - - ));
+DATA(insert OID = 686 (  "*"	   PGNSP PGUID b f  20  20  20 686   0   0   0   0   0 int8mul - - ));
+DATA(insert OID = 687 (  "/"	   PGNSP PGUID b f  20  20  20   0   0   0   0   0   0 int8div - - ));
+DATA(insert OID = 688 (  "+"	   PGNSP PGUID b f  20  23  20 692   0   0   0   0   0 int84pl - - ));
+DATA(insert OID = 689 (  "-"	   PGNSP PGUID b f  20  23  20   0   0   0   0   0   0 int84mi - - ));
+DATA(insert OID = 690 (  "*"	   PGNSP PGUID b f  20  23  20 694   0   0   0   0   0 int84mul - - ));
+DATA(insert OID = 691 (  "/"	   PGNSP PGUID b f  20  23  20   0   0   0   0   0   0 int84div - - ));
+DATA(insert OID = 692 (  "+"	   PGNSP PGUID b f  23  20  20 688   0   0   0   0   0 int48pl - - ));
+DATA(insert OID = 693 (  "-"	   PGNSP PGUID b f  23  20  20   0   0   0   0   0   0 int48mi - - ));
+DATA(insert OID = 694 (  "*"	   PGNSP PGUID b f  23  20  20 690   0   0   0   0   0 int48mul - - ));
+DATA(insert OID = 695 (  "/"	   PGNSP PGUID b f  23  20  20   0   0   0   0   0   0 int48div - - ));
+
+DATA(insert OID = 706 (  "<->"	   PGNSP PGUID b f 603 603 701 706   0  0  0   0   0 box_distance - - ));
+DATA(insert OID = 707 (  "<->"	   PGNSP PGUID b f 602 602 701 707   0  0  0   0   0 path_distance - - ));
+DATA(insert OID = 708 (  "<->"	   PGNSP PGUID b f 628 628 701 708   0  0  0   0   0 line_distance - - ));
+DATA(insert OID = 709 (  "<->"	   PGNSP PGUID b f 601 601 701 709   0  0  0   0   0 lseg_distance - - ));
+DATA(insert OID = 712 (  "<->"	   PGNSP PGUID b f 604 604 701 712   0  0  0   0   0 poly_distance - - ));
 
 /* add translation/rotation/scaling operators for geometric types. - thomas 97/05/10 */
-DATA(insert OID = 731 (  "+"	   PGNSP PGUID 0 b t f  600  600	600  731  0 0 0 0 0 point_add - - ));
-DATA(insert OID = 732 (  "-"	   PGNSP PGUID 0 b t f  600  600	600    0  0 0 0 0 0 point_sub - - ));
-DATA(insert OID = 733 (  "*"	   PGNSP PGUID 0 b t f  600  600	600  733  0 0 0 0 0 point_mul - - ));
-DATA(insert OID = 734 (  "/"	   PGNSP PGUID 0 b t f  600  600	600    0  0 0 0 0 0 point_div - - ));
-DATA(insert OID = 735 (  "+"	   PGNSP PGUID 0 b t f  602  602	602  735  0 0 0 0 0 path_add - - ));
-DATA(insert OID = 736 (  "+"	   PGNSP PGUID 0 b t f  602  600	602    0  0 0 0 0 0 path_add_pt - - ));
-DATA(insert OID = 737 (  "-"	   PGNSP PGUID 0 b t f  602  600	602    0  0 0 0 0 0 path_sub_pt - - ));
-DATA(insert OID = 738 (  "*"	   PGNSP PGUID 0 b t f  602  600	602    0  0 0 0 0 0 path_mul_pt - - ));
-DATA(insert OID = 739 (  "/"	   PGNSP PGUID 0 b t f  602  600	602    0  0 0 0 0 0 path_div_pt - - ));
-DATA(insert OID = 755 (  "~"	   PGNSP PGUID 0 b t f  602  600	 16  512  0 0 0 0 0 path_contain_pt - - ));
-DATA(insert OID = 756 (  "@"	   PGNSP PGUID 0 b t f  600  604	 16  757  0 0 0 0 0 pt_contained_poly - - ));
-DATA(insert OID = 757 (  "~"	   PGNSP PGUID 0 b t f  604  600	 16  756  0 0 0 0 0 poly_contain_pt - - ));
-DATA(insert OID = 758 (  "@"	   PGNSP PGUID 0 b t f  600  718	 16  759  0 0 0 0 0 pt_contained_circle - - ));
-DATA(insert OID = 759 (  "~"	   PGNSP PGUID 0 b t f  718  600	 16  758  0 0 0 0 0 circle_contain_pt - - ));
-
-DATA(insert OID = 773 (  "@"	   PGNSP PGUID 0 l t f   0  23  23   0   0   0   0   0   0 int4abs - - ));
+DATA(insert OID = 731 (  "+"	   PGNSP PGUID b f  600  600	600  731  0 0 0 0 0 point_add - - ));
+DATA(insert OID = 732 (  "-"	   PGNSP PGUID b f  600  600	600    0  0 0 0 0 0 point_sub - - ));
+DATA(insert OID = 733 (  "*"	   PGNSP PGUID b f  600  600	600  733  0 0 0 0 0 point_mul - - ));
+DATA(insert OID = 734 (  "/"	   PGNSP PGUID b f  600  600	600    0  0 0 0 0 0 point_div - - ));
+DATA(insert OID = 735 (  "+"	   PGNSP PGUID b f  602  602	602  735  0 0 0 0 0 path_add - - ));
+DATA(insert OID = 736 (  "+"	   PGNSP PGUID b f  602  600	602    0  0 0 0 0 0 path_add_pt - - ));
+DATA(insert OID = 737 (  "-"	   PGNSP PGUID b f  602  600	602    0  0 0 0 0 0 path_sub_pt - - ));
+DATA(insert OID = 738 (  "*"	   PGNSP PGUID b f  602  600	602    0  0 0 0 0 0 path_mul_pt - - ));
+DATA(insert OID = 739 (  "/"	   PGNSP PGUID b f  602  600	602    0  0 0 0 0 0 path_div_pt - - ));
+DATA(insert OID = 755 (  "~"	   PGNSP PGUID b f  602  600	 16  512  0 0 0 0 0 path_contain_pt - - ));
+DATA(insert OID = 756 (  "@"	   PGNSP PGUID b f  600  604	 16  757  0 0 0 0 0 pt_contained_poly - - ));
+DATA(insert OID = 757 (  "~"	   PGNSP PGUID b f  604  600	 16  756  0 0 0 0 0 poly_contain_pt - - ));
+DATA(insert OID = 758 (  "@"	   PGNSP PGUID b f  600  718	 16  759  0 0 0 0 0 pt_contained_circle - - ));
+DATA(insert OID = 759 (  "~"	   PGNSP PGUID b f  718  600	 16  758  0 0 0 0 0 circle_contain_pt - - ));
+
+DATA(insert OID = 773 (  "@"	   PGNSP PGUID l f   0  23  23   0   0   0   0   0   0 int4abs - - ));
 
 /* additional operators for geometric types - thomas 1997-07-09 */
-DATA(insert OID =  792 (  "="	   PGNSP PGUID 0 b t f  602  602	 16  792  0 0 0 0 0 path_n_eq eqsel eqjoinsel ));
-DATA(insert OID =  793 (  "<"	   PGNSP PGUID 0 b t f  602  602	 16  794  0 0 0 0 0 path_n_lt - - ));
-DATA(insert OID =  794 (  ">"	   PGNSP PGUID 0 b t f  602  602	 16  793  0 0 0 0 0 path_n_gt - - ));
-DATA(insert OID =  795 (  "<="	   PGNSP PGUID 0 b t f  602  602	 16  796  0 0 0 0 0 path_n_le - - ));
-DATA(insert OID =  796 (  ">="	   PGNSP PGUID 0 b t f  602  602	 16  795  0 0 0 0 0 path_n_ge - - ));
-DATA(insert OID =  797 (  "#"	   PGNSP PGUID 0 l t f	0  602	 23    0  0 0 0 0 0 path_npoints - - ));
-DATA(insert OID =  798 (  "?#"	   PGNSP PGUID 0 b t f  602  602	 16    0  0 0 0 0 0 path_inter - - ));
-DATA(insert OID =  799 (  "@-@"    PGNSP PGUID 0 l t f	0  602	701    0  0 0 0 0 0 path_length - - ));
-DATA(insert OID =  800 (  ">^"	   PGNSP PGUID 0 b t f  603  603	 16    0  0 0 0 0 0 box_above positionsel positionjoinsel ));
-DATA(insert OID =  801 (  "<^"	   PGNSP PGUID 0 b t f  603  603	 16    0  0 0 0 0 0 box_below positionsel positionjoinsel ));
-DATA(insert OID =  802 (  "?#"	   PGNSP PGUID 0 b t f  603  603	 16    0  0 0 0 0 0 box_overlap areasel areajoinsel ));
-DATA(insert OID =  803 (  "#"	   PGNSP PGUID 0 b t f  603  603	603    0  0 0 0 0 0 box_intersect - - ));
-DATA(insert OID =  804 (  "+"	   PGNSP PGUID 0 b t f  603  600	603    0  0 0 0 0 0 box_add - - ));
-DATA(insert OID =  805 (  "-"	   PGNSP PGUID 0 b t f  603  600	603    0  0 0 0 0 0 box_sub - - ));
-DATA(insert OID =  806 (  "*"	   PGNSP PGUID 0 b t f  603  600	603    0  0 0 0 0 0 box_mul - - ));
-DATA(insert OID =  807 (  "/"	   PGNSP PGUID 0 b t f  603  600	603    0  0 0 0 0 0 box_div - - ));
-DATA(insert OID =  808 (  "?-"	   PGNSP PGUID 0 b t f  600  600	 16  808  0 0 0 0 0 point_horiz - - ));
-DATA(insert OID =  809 (  "?|"	   PGNSP PGUID 0 b t f  600  600	 16  809  0 0 0 0 0 point_vert - - ));
-
-DATA(insert OID = 811 (  "="	   PGNSP PGUID 0 b t f 704 704  16 811 812   0   0   0   0 tintervaleq eqsel eqjoinsel ));
-DATA(insert OID = 812 (  "<>"	   PGNSP PGUID 0 b t f 704 704  16 812 811   0   0   0   0 tintervalne neqsel neqjoinsel ));
-DATA(insert OID = 813 (  "<"	   PGNSP PGUID 0 b t f 704 704  16 814 816   0   0   0   0 tintervallt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 814 (  ">"	   PGNSP PGUID 0 b t f 704 704  16 813 815   0   0   0   0 tintervalgt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 815 (  "<="	   PGNSP PGUID 0 b t f 704 704  16 816 814   0   0   0   0 tintervalle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 816 (  ">="	   PGNSP PGUID 0 b t f 704 704  16 815 813   0   0   0   0 tintervalge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID = 843 (  "*"	   PGNSP PGUID 0 b t f  790  700	790 845   0   0   0   0   0 cash_mul_flt4 - - ));
-DATA(insert OID = 844 (  "/"	   PGNSP PGUID 0 b t f  790  700	790   0   0   0   0   0   0 cash_div_flt4 - - ));
-DATA(insert OID = 845 (  "*"	   PGNSP PGUID 0 b t f  700  790	790 843   0   0   0   0   0 flt4_mul_cash - - ));
-
-DATA(insert OID = 900 (  "="	   PGNSP PGUID 0 b t t  790  790	16 900 901	902 902 902 903 cash_eq eqsel eqjoinsel ));
-DATA(insert OID = 901 (  "<>"	   PGNSP PGUID 0 b t f  790  790	16 901 900	0 0   0   0 cash_ne neqsel neqjoinsel ));
-DATA(insert OID = 902 (  "<"	   PGNSP PGUID 0 b t f  790  790	16 903 905	0 0   0   0 cash_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 903 (  ">"	   PGNSP PGUID 0 b t f  790  790	16 902 904	0 0   0   0 cash_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 904 (  "<="	   PGNSP PGUID 0 b t f  790  790	16 905 903	0 0   0   0 cash_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 905 (  ">="	   PGNSP PGUID 0 b t f  790  790	16 904 902	0 0   0   0 cash_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 906 (  "+"	   PGNSP PGUID 0 b t f  790  790	790 906   0   0   0   0   0 cash_pl - - ));
-DATA(insert OID = 907 (  "-"	   PGNSP PGUID 0 b t f  790  790	790   0   0   0   0   0   0 cash_mi - - ));
-DATA(insert OID = 908 (  "*"	   PGNSP PGUID 0 b t f  790  701	790 916   0   0   0   0   0 cash_mul_flt8 - - ));
-DATA(insert OID = 909 (  "/"	   PGNSP PGUID 0 b t f  790  701	790   0   0   0   0   0   0 cash_div_flt8 - - ));
-DATA(insert OID = 912 (  "*"	   PGNSP PGUID 0 b t f  790  23	790 917   0   0   0   0   0 cash_mul_int4 - - ));
-DATA(insert OID = 913 (  "/"	   PGNSP PGUID 0 b t f  790  23	790   0   0   0   0   0   0 cash_div_int4 - - ));
-DATA(insert OID = 914 (  "*"	   PGNSP PGUID 0 b t f  790  21	790 918   0   0   0   0   0 cash_mul_int2 - - ));
-DATA(insert OID = 915 (  "/"	   PGNSP PGUID 0 b t f  790  21	790   0   0   0   0   0   0 cash_div_int2 - - ));
-DATA(insert OID = 916 (  "*"	   PGNSP PGUID 0 b t f  701  790	790 908   0   0   0   0   0 flt8_mul_cash - - ));
-DATA(insert OID = 917 (  "*"	   PGNSP PGUID 0 b t f  23  790	790 912   0   0   0   0   0 int4_mul_cash - - ));
-DATA(insert OID = 918 (  "*"	   PGNSP PGUID 0 b t f  21  790	790 914   0   0   0   0   0 int2_mul_cash - - ));
-
-DATA(insert OID = 965 (  "^"	   PGNSP PGUID 0 b t f  701  701	701 0 0 0 0 0 0 dpow - - ));
-DATA(insert OID = 966 (  "+"	   PGNSP PGUID 0 b t f 1034 1033 1034 0 0 0 0 0 0 aclinsert	- - ));
-DATA(insert OID = 967 (  "-"	   PGNSP PGUID 0 b t f 1034 1033 1034 0 0 0 0 0 0 aclremove	- - ));
-DATA(insert OID = 968 (  "~"	   PGNSP PGUID 0 b t f 1034 1033	 16 0 0 0 0 0 0 aclcontains - - ));
+DATA(insert OID =  792 (  "="	   PGNSP PGUID b f  602  602	 16  792  0 0 0 0 0 path_n_eq eqsel eqjoinsel ));
+DATA(insert OID =  793 (  "<"	   PGNSP PGUID b f  602  602	 16  794  0 0 0 0 0 path_n_lt - - ));
+DATA(insert OID =  794 (  ">"	   PGNSP PGUID b f  602  602	 16  793  0 0 0 0 0 path_n_gt - - ));
+DATA(insert OID =  795 (  "<="	   PGNSP PGUID b f  602  602	 16  796  0 0 0 0 0 path_n_le - - ));
+DATA(insert OID =  796 (  ">="	   PGNSP PGUID b f  602  602	 16  795  0 0 0 0 0 path_n_ge - - ));
+DATA(insert OID =  797 (  "#"	   PGNSP PGUID l f	0  602	 23    0  0 0 0 0 0 path_npoints - - ));
+DATA(insert OID =  798 (  "?#"	   PGNSP PGUID b f  602  602	 16    0  0 0 0 0 0 path_inter - - ));
+DATA(insert OID =  799 (  "@-@"    PGNSP PGUID l f	0  602	701    0  0 0 0 0 0 path_length - - ));
+DATA(insert OID =  800 (  ">^"	   PGNSP PGUID b f  603  603	 16    0  0 0 0 0 0 box_above positionsel positionjoinsel ));
+DATA(insert OID =  801 (  "<^"	   PGNSP PGUID b f  603  603	 16    0  0 0 0 0 0 box_below positionsel positionjoinsel ));
+DATA(insert OID =  802 (  "?#"	   PGNSP PGUID b f  603  603	 16    0  0 0 0 0 0 box_overlap areasel areajoinsel ));
+DATA(insert OID =  803 (  "#"	   PGNSP PGUID b f  603  603	603    0  0 0 0 0 0 box_intersect - - ));
+DATA(insert OID =  804 (  "+"	   PGNSP PGUID b f  603  600	603    0  0 0 0 0 0 box_add - - ));
+DATA(insert OID =  805 (  "-"	   PGNSP PGUID b f  603  600	603    0  0 0 0 0 0 box_sub - - ));
+DATA(insert OID =  806 (  "*"	   PGNSP PGUID b f  603  600	603    0  0 0 0 0 0 box_mul - - ));
+DATA(insert OID =  807 (  "/"	   PGNSP PGUID b f  603  600	603    0  0 0 0 0 0 box_div - - ));
+DATA(insert OID =  808 (  "?-"	   PGNSP PGUID b f  600  600	 16  808  0 0 0 0 0 point_horiz - - ));
+DATA(insert OID =  809 (  "?|"	   PGNSP PGUID b f  600  600	 16  809  0 0 0 0 0 point_vert - - ));
+
+DATA(insert OID = 811 (  "="	   PGNSP PGUID b f 704 704  16 811 812   0   0   0   0 tintervaleq eqsel eqjoinsel ));
+DATA(insert OID = 812 (  "<>"	   PGNSP PGUID b f 704 704  16 812 811   0   0   0   0 tintervalne neqsel neqjoinsel ));
+DATA(insert OID = 813 (  "<"	   PGNSP PGUID b f 704 704  16 814 816   0   0   0   0 tintervallt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 814 (  ">"	   PGNSP PGUID b f 704 704  16 813 815   0   0   0   0 tintervalgt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 815 (  "<="	   PGNSP PGUID b f 704 704  16 816 814   0   0   0   0 tintervalle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 816 (  ">="	   PGNSP PGUID b f 704 704  16 815 813   0   0   0   0 tintervalge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID = 843 (  "*"	   PGNSP PGUID b f  790  700	790 845   0   0   0   0   0 cash_mul_flt4 - - ));
+DATA(insert OID = 844 (  "/"	   PGNSP PGUID b f  790  700	790   0   0   0   0   0   0 cash_div_flt4 - - ));
+DATA(insert OID = 845 (  "*"	   PGNSP PGUID b f  700  790	790 843   0   0   0   0   0 flt4_mul_cash - - ));
+
+DATA(insert OID = 900 (  "="	   PGNSP PGUID b t  790  790	16 900 901	902 902 902 903 cash_eq eqsel eqjoinsel ));
+DATA(insert OID = 901 (  "<>"	   PGNSP PGUID b f  790  790	16 901 900	0 0   0   0 cash_ne neqsel neqjoinsel ));
+DATA(insert OID = 902 (  "<"	   PGNSP PGUID b f  790  790	16 903 905	0 0   0   0 cash_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 903 (  ">"	   PGNSP PGUID b f  790  790	16 902 904	0 0   0   0 cash_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 904 (  "<="	   PGNSP PGUID b f  790  790	16 905 903	0 0   0   0 cash_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 905 (  ">="	   PGNSP PGUID b f  790  790	16 904 902	0 0   0   0 cash_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 906 (  "+"	   PGNSP PGUID b f  790  790	790 906   0   0   0   0   0 cash_pl - - ));
+DATA(insert OID = 907 (  "-"	   PGNSP PGUID b f  790  790	790   0   0   0   0   0   0 cash_mi - - ));
+DATA(insert OID = 908 (  "*"	   PGNSP PGUID b f  790  701	790 916   0   0   0   0   0 cash_mul_flt8 - - ));
+DATA(insert OID = 909 (  "/"	   PGNSP PGUID b f  790  701	790   0   0   0   0   0   0 cash_div_flt8 - - ));
+DATA(insert OID = 912 (  "*"	   PGNSP PGUID b f  790  23	790 917   0   0   0   0   0 cash_mul_int4 - - ));
+DATA(insert OID = 913 (  "/"	   PGNSP PGUID b f  790  23	790   0   0   0   0   0   0 cash_div_int4 - - ));
+DATA(insert OID = 914 (  "*"	   PGNSP PGUID b f  790  21	790 918   0   0   0   0   0 cash_mul_int2 - - ));
+DATA(insert OID = 915 (  "/"	   PGNSP PGUID b f  790  21	790   0   0   0   0   0   0 cash_div_int2 - - ));
+DATA(insert OID = 916 (  "*"	   PGNSP PGUID b f  701  790	790 908   0   0   0   0   0 flt8_mul_cash - - ));
+DATA(insert OID = 917 (  "*"	   PGNSP PGUID b f  23  790	790 912   0   0   0   0   0 int4_mul_cash - - ));
+DATA(insert OID = 918 (  "*"	   PGNSP PGUID b f  21  790	790 914   0   0   0   0   0 int2_mul_cash - - ));
+
+DATA(insert OID = 965 (  "^"	   PGNSP PGUID b f  701  701	701 0 0 0 0 0 0 dpow - - ));
+DATA(insert OID = 966 (  "+"	   PGNSP PGUID b f 1034 1033 1034 0 0 0 0 0 0 aclinsert	- - ));
+DATA(insert OID = 967 (  "-"	   PGNSP PGUID b f 1034 1033 1034 0 0 0 0 0 0 aclremove	- - ));
+DATA(insert OID = 968 (  "~"	   PGNSP PGUID b f 1034 1033	 16 0 0 0 0 0 0 aclcontains - - ));
 
 /* additional geometric operators - thomas 1997-07-09 */
-DATA(insert OID =  969 (  "@@"	   PGNSP PGUID 0 l t f	0  601	600    0  0 0 0 0 0 lseg_center - - ));
-DATA(insert OID =  970 (  "@@"	   PGNSP PGUID 0 l t f	0  602	600    0  0 0 0 0 0 path_center - - ));
-DATA(insert OID =  971 (  "@@"	   PGNSP PGUID 0 l t f	0  604	600    0  0 0 0 0 0 poly_center - - ));
+DATA(insert OID =  969 (  "@@"	   PGNSP PGUID l f	0  601	600    0  0 0 0 0 0 lseg_center - - ));
+DATA(insert OID =  970 (  "@@"	   PGNSP PGUID l f	0  602	600    0  0 0 0 0 0 path_center - - ));
+DATA(insert OID =  971 (  "@@"	   PGNSP PGUID l f	0  604	600    0  0 0 0 0 0 poly_center - - ));
 
-DATA(insert OID =  974 (  "||"	   PGNSP PGUID 0 b t f 1042 1042 1042    0  0 0 0 0 0 textcat - - ));
-DATA(insert OID =  979 (  "||"	   PGNSP PGUID 0 b t f 1043 1043 1043    0  0 0 0 0 0 textcat - - ));
+DATA(insert OID =  974 (  "||"	   PGNSP PGUID b f 1042 1042 1042    0  0 0 0 0 0 textcat - - ));
+DATA(insert OID =  979 (  "||"	   PGNSP PGUID b f 1043 1043 1043    0  0 0 0 0 0 textcat - - ));
 
-DATA(insert OID = 1054 ( "="	   PGNSP PGUID 0 b t f 1042 1042	 16 1054 1057 1058 1058 1058 1060 bpchareq eqsel eqjoinsel ));
-DATA(insert OID = 1055 ( "~"	   PGNSP PGUID 0 b t f 1042	25	 16    0 1056  0 0 0 0 textregexeq regexeqsel regexeqjoinsel ));
+DATA(insert OID = 1054 ( "="	   PGNSP PGUID b f 1042 1042	 16 1054 1057 1058 1058 1058 1060 bpchareq eqsel eqjoinsel ));
+DATA(insert OID = 1055 ( "~"	   PGNSP PGUID b f 1042	25	 16    0 1056  0 0 0 0 textregexeq regexeqsel regexeqjoinsel ));
 #define OID_BPCHAR_REGEXEQ_OP		1055
-DATA(insert OID = 1056 ( "!~"	   PGNSP PGUID 0 b t f 1042	25	 16    0 1055  0 0 0 0 textregexne regexnesel regexnejoinsel ));
-DATA(insert OID = 1057 ( "<>"	   PGNSP PGUID 0 b t f 1042 1042	 16 1057 1054  0 0 0 0 bpcharne neqsel neqjoinsel ));
-DATA(insert OID = 1058 ( "<"	   PGNSP PGUID 0 b t f 1042 1042	 16 1060 1061  0 0 0 0 bpcharlt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1059 ( "<="	   PGNSP PGUID 0 b t f 1042 1042	 16 1061 1060  0 0 0 0 bpcharle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1060 ( ">"	   PGNSP PGUID 0 b t f 1042 1042	 16 1058 1059  0 0 0 0 bpchargt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1061 ( ">="	   PGNSP PGUID 0 b t f 1042 1042	 16 1059 1058  0 0 0 0 bpcharge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID = 1062 ( "="	   PGNSP PGUID 0 b t t 1043 1043	16	1062 1065 1066 1066 1066 1068 varchareq eqsel eqjoinsel ));
-DATA(insert OID = 1063 ( "~"	   PGNSP PGUID 0 b t f 1043	25	16 0 1064  0 0 0 0 textregexeq regexeqsel regexeqjoinsel ));
+DATA(insert OID = 1056 ( "!~"	   PGNSP PGUID b f 1042	25	 16    0 1055  0 0 0 0 textregexne regexnesel regexnejoinsel ));
+DATA(insert OID = 1057 ( "<>"	   PGNSP PGUID b f 1042 1042	 16 1057 1054  0 0 0 0 bpcharne neqsel neqjoinsel ));
+DATA(insert OID = 1058 ( "<"	   PGNSP PGUID b f 1042 1042	 16 1060 1061  0 0 0 0 bpcharlt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1059 ( "<="	   PGNSP PGUID b f 1042 1042	 16 1061 1060  0 0 0 0 bpcharle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1060 ( ">"	   PGNSP PGUID b f 1042 1042	 16 1058 1059  0 0 0 0 bpchargt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1061 ( ">="	   PGNSP PGUID b f 1042 1042	 16 1059 1058  0 0 0 0 bpcharge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID = 1062 ( "="	   PGNSP PGUID b t 1043 1043	16	1062 1065 1066 1066 1066 1068 varchareq eqsel eqjoinsel ));
+DATA(insert OID = 1063 ( "~"	   PGNSP PGUID b f 1043	25	16 0 1064  0 0 0 0 textregexeq regexeqsel regexeqjoinsel ));
 #define OID_VARCHAR_REGEXEQ_OP		1063
-DATA(insert OID = 1064 ( "!~"	   PGNSP PGUID 0 b t f 1043	25	16 0 1063  0 0 0 0 textregexne regexnesel regexnejoinsel ));
-DATA(insert OID = 1065 ( "<>"	   PGNSP PGUID 0 b t f 1043 1043	16 1065 1062  0 0 0 0 varcharne neqsel neqjoinsel ));
-DATA(insert OID = 1066 ( "<"	   PGNSP PGUID 0 b t f 1043 1043	16 1068 1069  0 0 0 0 varcharlt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1067 ( "<="	   PGNSP PGUID 0 b t f 1043 1043	16 1069 1068  0 0 0 0 varcharle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1068 ( ">"	   PGNSP PGUID 0 b t f 1043 1043	16 1066 1067  0 0 0 0 varchargt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1069 ( ">="	   PGNSP PGUID 0 b t f 1043 1043	16 1067 1066  0 0 0 0 varcharge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1064 ( "!~"	   PGNSP PGUID b f 1043	25	16 0 1063  0 0 0 0 textregexne regexnesel regexnejoinsel ));
+DATA(insert OID = 1065 ( "<>"	   PGNSP PGUID b f 1043 1043	16 1065 1062  0 0 0 0 varcharne neqsel neqjoinsel ));
+DATA(insert OID = 1066 ( "<"	   PGNSP PGUID b f 1043 1043	16 1068 1069  0 0 0 0 varcharlt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1067 ( "<="	   PGNSP PGUID b f 1043 1043	16 1069 1068  0 0 0 0 varcharle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1068 ( ">"	   PGNSP PGUID b f 1043 1043	16 1066 1067  0 0 0 0 varchargt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1069 ( ">="	   PGNSP PGUID b f 1043 1043	16 1067 1066  0 0 0 0 varcharge scalargtsel scalargtjoinsel ));
 
 /* date operators */
-DATA(insert OID = 1076 ( "+"	   PGNSP PGUID 0 b t f  1082	1186 1114 0 0 0 0 0 0 date_pl_interval - - ));
-DATA(insert OID = 1077 ( "-"	   PGNSP PGUID 0 b t f  1082	1186 1114 0 0 0 0 0 0 date_mi_interval - - ));
-DATA(insert OID = 1093 ( "="	   PGNSP PGUID 0 b t t  1082	1082   16 1093 1094 1095 1095 1095 1097 date_eq eqsel eqjoinsel ));
-DATA(insert OID = 1094 ( "<>"	   PGNSP PGUID 0 b t f  1082	1082   16 1094 1093  0 0 0 0 date_ne neqsel neqjoinsel ));
-DATA(insert OID = 1095 ( "<"	   PGNSP PGUID 0 b t f  1082	1082   16 1097 1098  0 0 0 0 date_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1096 ( "<="	   PGNSP PGUID 0 b t f  1082	1082   16 1098 1097  0 0 0 0 date_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1097 ( ">"	   PGNSP PGUID 0 b t f  1082	1082   16 1095 1096  0 0 0 0 date_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1098 ( ">="	   PGNSP PGUID 0 b t f  1082	1082   16 1096 1095  0 0 0 0 date_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1099 ( "-"	   PGNSP PGUID 0 b t f  1082	1082   23 0 0 0 0 0 0 date_mi - - ));
-DATA(insert OID = 1100 ( "+"	   PGNSP PGUID 0 b t f  1082	  23 1082 0 0 0 0 0 0 date_pli - - ));
-DATA(insert OID = 1101 ( "-"	   PGNSP PGUID 0 b t f  1082	  23 1082 0 0 0 0 0 0 date_mii - - ));
+DATA(insert OID = 1076 ( "+"	   PGNSP PGUID b f  1082	1186 1114 0 0 0 0 0 0 date_pl_interval - - ));
+DATA(insert OID = 1077 ( "-"	   PGNSP PGUID b f  1082	1186 1114 0 0 0 0 0 0 date_mi_interval - - ));
+DATA(insert OID = 1093 ( "="	   PGNSP PGUID b t  1082	1082   16 1093 1094 1095 1095 1095 1097 date_eq eqsel eqjoinsel ));
+DATA(insert OID = 1094 ( "<>"	   PGNSP PGUID b f  1082	1082   16 1094 1093  0 0 0 0 date_ne neqsel neqjoinsel ));
+DATA(insert OID = 1095 ( "<"	   PGNSP PGUID b f  1082	1082   16 1097 1098  0 0 0 0 date_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1096 ( "<="	   PGNSP PGUID b f  1082	1082   16 1098 1097  0 0 0 0 date_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1097 ( ">"	   PGNSP PGUID b f  1082	1082   16 1095 1096  0 0 0 0 date_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1098 ( ">="	   PGNSP PGUID b f  1082	1082   16 1096 1095  0 0 0 0 date_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1099 ( "-"	   PGNSP PGUID b f  1082	1082   23 0 0 0 0 0 0 date_mi - - ));
+DATA(insert OID = 1100 ( "+"	   PGNSP PGUID b f  1082	  23 1082 0 0 0 0 0 0 date_pli - - ));
+DATA(insert OID = 1101 ( "-"	   PGNSP PGUID b f  1082	  23 1082 0 0 0 0 0 0 date_mii - - ));
 
 /* time operators */
-DATA(insert OID = 1108 ( "="	   PGNSP PGUID 0 b t f  1083	1083  16 1108 1109 1110 1110 1110 1112 time_eq eqsel eqjoinsel ));
-DATA(insert OID = 1109 ( "<>"	   PGNSP PGUID 0 b t f  1083	1083  16 1109 1108	0 0   0   0 time_ne neqsel neqjoinsel ));
-DATA(insert OID = 1110 ( "<"	   PGNSP PGUID 0 b t f  1083	1083  16 1112 1113	0 0   0   0 time_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1111 ( "<="	   PGNSP PGUID 0 b t f  1083	1083  16 1113 1112	0 0   0   0 time_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1112 ( ">"	   PGNSP PGUID 0 b t f  1083	1083  16 1110 1111	0 0   0   0 time_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1113 ( ">="	   PGNSP PGUID 0 b t f  1083	1083  16 1111 1110	0 0   0   0 time_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1269 (  "-"	   PGNSP PGUID 0 b t f  1186 1083 1083 0 0 0 0 0 0 interval_mi_time - - ));
+DATA(insert OID = 1108 ( "="	   PGNSP PGUID b f  1083	1083  16 1108 1109 1110 1110 1110 1112 time_eq eqsel eqjoinsel ));
+DATA(insert OID = 1109 ( "<>"	   PGNSP PGUID b f  1083	1083  16 1109 1108	0 0   0   0 time_ne neqsel neqjoinsel ));
+DATA(insert OID = 1110 ( "<"	   PGNSP PGUID b f  1083	1083  16 1112 1113	0 0   0   0 time_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1111 ( "<="	   PGNSP PGUID b f  1083	1083  16 1113 1112	0 0   0   0 time_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1112 ( ">"	   PGNSP PGUID b f  1083	1083  16 1110 1111	0 0   0   0 time_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1113 ( ">="	   PGNSP PGUID b f  1083	1083  16 1111 1110	0 0   0   0 time_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1269 (  "-"	   PGNSP PGUID b f  1186 1083 1083 0 0 0 0 0 0 interval_mi_time - - ));
 
 /* timetz operators */
-DATA(insert OID = 1295 (  "-"	   PGNSP PGUID 0 b t f  1186 1266 1266 0 0 0 0 0 0 interval_mi_timetz - - ));
-DATA(insert OID = 1550 ( "="	   PGNSP PGUID 0 b t f  1266 1266   16 1550 1551 1552 1552 1552 1554 timetz_eq eqsel eqjoinsel ));
-DATA(insert OID = 1551 ( "<>"	   PGNSP PGUID 0 b t f  1266 1266   16 1551 1550	0 0   0   0 timetz_ne neqsel neqjoinsel ));
-DATA(insert OID = 1552 ( "<"	   PGNSP PGUID 0 b t f  1266 1266   16 1554 1555	0 0   0   0 timetz_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1553 ( "<="	   PGNSP PGUID 0 b t f  1266 1266   16 1555 1554	0 0   0   0 timetz_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1554 ( ">"	   PGNSP PGUID 0 b t f  1266 1266   16 1552 1553	0 0   0   0 timetz_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1555 ( ">="	   PGNSP PGUID 0 b t f  1266 1266   16 1553 1552	0 0   0   0 timetz_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1295 (  "-"	   PGNSP PGUID b f  1186 1266 1266 0 0 0 0 0 0 interval_mi_timetz - - ));
+DATA(insert OID = 1550 ( "="	   PGNSP PGUID b f  1266 1266   16 1550 1551 1552 1552 1552 1554 timetz_eq eqsel eqjoinsel ));
+DATA(insert OID = 1551 ( "<>"	   PGNSP PGUID b f  1266 1266   16 1551 1550	0 0   0   0 timetz_ne neqsel neqjoinsel ));
+DATA(insert OID = 1552 ( "<"	   PGNSP PGUID b f  1266 1266   16 1554 1555	0 0   0   0 timetz_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1553 ( "<="	   PGNSP PGUID b f  1266 1266   16 1555 1554	0 0   0   0 timetz_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1554 ( ">"	   PGNSP PGUID b f  1266 1266   16 1552 1553	0 0   0   0 timetz_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1555 ( ">="	   PGNSP PGUID b f  1266 1266   16 1553 1552	0 0   0   0 timetz_ge scalargtsel scalargtjoinsel ));
 
 /* float48 operators */
-DATA(insert OID = 1116 (  "+"		PGNSP PGUID 0 b t f 700 701 701 1126	 0	 0	 0   0   0 float48pl - - ));
-DATA(insert OID = 1117 (  "-"		PGNSP PGUID 0 b t f 700 701 701	 0	 0	 0	 0   0   0 float48mi - - ));
-DATA(insert OID = 1118 (  "/"		PGNSP PGUID 0 b t f 700 701 701	 0	 0	 0	 0   0   0 float48div - - ));
-DATA(insert OID = 1119 (  "*"		PGNSP PGUID 0 b t f 700 701 701 1129	 0	 0	 0   0   0 float48mul - - ));
-DATA(insert OID = 1120 (  "="		PGNSP PGUID 0 b t f  700	701  16 1130 1121  622	672 1122 1123 float48eq eqsel eqjoinsel ));
-DATA(insert OID = 1121 (  "<>"		PGNSP PGUID 0 b t f  700	701  16 1131 1120  0 0 0 0 float48ne neqsel neqjoinsel ));
-DATA(insert OID = 1122 (  "<"		PGNSP PGUID 0 b t f  700	701  16 1133 1125  0 0 0 0 float48lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1123 (  ">"		PGNSP PGUID 0 b t f  700	701  16 1132 1124  0 0 0 0 float48gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1124 (  "<="		PGNSP PGUID 0 b t f  700	701  16 1135 1123  0 0 0 0 float48le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1125 (  ">="		PGNSP PGUID 0 b t f  700	701  16 1134 1122  0 0 0 0 float48ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1116 (  "+"		PGNSP PGUID b f 700 701 701 1126	 0	 0	 0   0   0 float48pl - - ));
+DATA(insert OID = 1117 (  "-"		PGNSP PGUID b f 700 701 701	 0	 0	 0	 0   0   0 float48mi - - ));
+DATA(insert OID = 1118 (  "/"		PGNSP PGUID b f 700 701 701	 0	 0	 0	 0   0   0 float48div - - ));
+DATA(insert OID = 1119 (  "*"		PGNSP PGUID b f 700 701 701 1129	 0	 0	 0   0   0 float48mul - - ));
+DATA(insert OID = 1120 (  "="		PGNSP PGUID b f  700	701  16 1130 1121  622	672 1122 1123 float48eq eqsel eqjoinsel ));
+DATA(insert OID = 1121 (  "<>"		PGNSP PGUID b f  700	701  16 1131 1120  0 0 0 0 float48ne neqsel neqjoinsel ));
+DATA(insert OID = 1122 (  "<"		PGNSP PGUID b f  700	701  16 1133 1125  0 0 0 0 float48lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1123 (  ">"		PGNSP PGUID b f  700	701  16 1132 1124  0 0 0 0 float48gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1124 (  "<="		PGNSP PGUID b f  700	701  16 1135 1123  0 0 0 0 float48le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1125 (  ">="		PGNSP PGUID b f  700	701  16 1134 1122  0 0 0 0 float48ge scalargtsel scalargtjoinsel ));
 
 /* float84 operators */
-DATA(insert OID = 1126 (  "+"		PGNSP PGUID 0 b t f 701 700 701 1116	 0	 0	 0   0   0 float84pl - - ));
-DATA(insert OID = 1127 (  "-"		PGNSP PGUID 0 b t f 701 700 701	 0	 0	 0	 0   0   0 float84mi - - ));
-DATA(insert OID = 1128 (  "/"		PGNSP PGUID 0 b t f 701 700 701	 0	 0	 0	 0   0   0 float84div - - ));
-DATA(insert OID = 1129 (  "*"		PGNSP PGUID 0 b t f 701 700 701 1119	 0	 0	 0   0   0 float84mul - - ));
-DATA(insert OID = 1130 (  "="		PGNSP PGUID 0 b t f  701	700  16 1120 1131  672 622 1132 1133 float84eq eqsel eqjoinsel ));
-DATA(insert OID = 1131 (  "<>"		PGNSP PGUID 0 b t f  701	700  16 1121 1130  0 0 0 0 float84ne neqsel neqjoinsel ));
-DATA(insert OID = 1132 (  "<"		PGNSP PGUID 0 b t f  701	700  16 1123 1135  0 0 0 0 float84lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1133 (  ">"		PGNSP PGUID 0 b t f  701	700  16 1122 1134  0 0 0 0 float84gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1134 (  "<="		PGNSP PGUID 0 b t f  701	700  16 1125 1133  0 0 0 0 float84le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1135 (  ">="		PGNSP PGUID 0 b t f  701	700  16 1124 1132  0 0 0 0 float84ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1126 (  "+"		PGNSP PGUID b f 701 700 701 1116	 0	 0	 0   0   0 float84pl - - ));
+DATA(insert OID = 1127 (  "-"		PGNSP PGUID b f 701 700 701	 0	 0	 0	 0   0   0 float84mi - - ));
+DATA(insert OID = 1128 (  "/"		PGNSP PGUID b f 701 700 701	 0	 0	 0	 0   0   0 float84div - - ));
+DATA(insert OID = 1129 (  "*"		PGNSP PGUID b f 701 700 701 1119	 0	 0	 0   0   0 float84mul - - ));
+DATA(insert OID = 1130 (  "="		PGNSP PGUID b f  701	700  16 1120 1131  672 622 1132 1133 float84eq eqsel eqjoinsel ));
+DATA(insert OID = 1131 (  "<>"		PGNSP PGUID b f  701	700  16 1121 1130  0 0 0 0 float84ne neqsel neqjoinsel ));
+DATA(insert OID = 1132 (  "<"		PGNSP PGUID b f  701	700  16 1123 1135  0 0 0 0 float84lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1133 (  ">"		PGNSP PGUID b f  701	700  16 1122 1134  0 0 0 0 float84gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1134 (  "<="		PGNSP PGUID b f  701	700  16 1125 1133  0 0 0 0 float84le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1135 (  ">="		PGNSP PGUID b f  701	700  16 1124 1132  0 0 0 0 float84ge scalargtsel scalargtjoinsel ));
 
 /* int4 vs oid equality --- use oid (unsigned) comparison */
-DATA(insert OID = 1136 (  "="		PGNSP PGUID 0 b t t	23	 26   16 1137 1656 0 0 0 0 oideq eqsel eqjoinsel ));
-DATA(insert OID = 1137 (  "="		PGNSP PGUID 0 b t t	26	 23   16 1136 1661 0 0 0 0 oideq eqsel eqjoinsel ));
+DATA(insert OID = 1136 (  "="		PGNSP PGUID b t	23	 26   16 1137 1656 0 0 0 0 oideq eqsel eqjoinsel ));
+DATA(insert OID = 1137 (  "="		PGNSP PGUID b t	26	 23   16 1136 1661 0 0 0 0 oideq eqsel eqjoinsel ));
 
-DATA(insert OID = 1158 (  "!"		PGNSP PGUID 0 r t f	21	  0   23 0 0 0 0 0 0 int2fac - - ));
-DATA(insert OID = 1175 (  "!!"		PGNSP PGUID 0 l t f	 0	 21   23 0 0 0 0 0 0 int2fac - - ));
+DATA(insert OID = 1158 (  "!"		PGNSP PGUID r f	21	  0   23 0 0 0 0 0 0 int2fac - - ));
+DATA(insert OID = 1175 (  "!!"		PGNSP PGUID l f	 0	 21   23 0 0 0 0 0 0 int2fac - - ));
 
 /* LIKE hacks by Keith Parks. */
-DATA(insert OID = 1207 (  "~~"	  PGNSP PGUID 0 b t f  19   25  16 0 1208 0 0 0 0 namelike likesel likejoinsel ));
+DATA(insert OID = 1207 (  "~~"	  PGNSP PGUID b f  19   25  16 0 1208 0 0 0 0 namelike likesel likejoinsel ));
 #define OID_NAME_LIKE_OP		1207
-DATA(insert OID = 1208 (  "!~~"   PGNSP PGUID 0 b t f  19   25  16 0 1207 0 0 0 0 namenlike nlikesel nlikejoinsel ));
-DATA(insert OID = 1209 (  "~~"	  PGNSP PGUID 0 b t f  25   25  16 0 1210 0 0 0 0 textlike likesel likejoinsel ));
+DATA(insert OID = 1208 (  "!~~"   PGNSP PGUID b f  19   25  16 0 1207 0 0 0 0 namenlike nlikesel nlikejoinsel ));
+DATA(insert OID = 1209 (  "~~"	  PGNSP PGUID b f  25   25  16 0 1210 0 0 0 0 textlike likesel likejoinsel ));
 #define OID_TEXT_LIKE_OP		1209
-DATA(insert OID = 1210 (  "!~~"   PGNSP PGUID 0 b t f  25   25  16 0 1209 0 0 0 0 textnlike nlikesel nlikejoinsel ));
-DATA(insert OID = 1211 (  "~~"	  PGNSP PGUID 0 b t f  1042 25  16 0 1212 0 0 0 0 textlike likesel likejoinsel ));
+DATA(insert OID = 1210 (  "!~~"   PGNSP PGUID b f  25   25  16 0 1209 0 0 0 0 textnlike nlikesel nlikejoinsel ));
+DATA(insert OID = 1211 (  "~~"	  PGNSP PGUID b f  1042 25  16 0 1212 0 0 0 0 textlike likesel likejoinsel ));
 #define OID_BPCHAR_LIKE_OP		1211
-DATA(insert OID = 1212 (  "!~~"   PGNSP PGUID 0 b t f  1042 25  16 0 1211 0 0 0 0 textnlike nlikesel nlikejoinsel ));
-DATA(insert OID = 1213 (  "~~"	  PGNSP PGUID 0 b t f  1043 25  16 0 1214 0 0 0 0 textlike likesel likejoinsel ));
+DATA(insert OID = 1212 (  "!~~"   PGNSP PGUID b f  1042 25  16 0 1211 0 0 0 0 textnlike nlikesel nlikejoinsel ));
+DATA(insert OID = 1213 (  "~~"	  PGNSP PGUID b f  1043 25  16 0 1214 0 0 0 0 textlike likesel likejoinsel ));
 #define OID_VARCHAR_LIKE_OP		1213
-DATA(insert OID = 1214 (  "!~~"   PGNSP PGUID 0 b t f  1043 25  16 0 1213 0 0 0 0 textnlike nlikesel nlikejoinsel ));
+DATA(insert OID = 1214 (  "!~~"   PGNSP PGUID b f  1043 25  16 0 1213 0 0 0 0 textnlike nlikesel nlikejoinsel ));
 
 /* case-insensitive regex hacks */
-DATA(insert OID = 1226 (  "~*"		 PGNSP PGUID 0 b t f	19	25	16 0 1227  0 0 0 0 nameicregexeq icregexeqsel icregexeqjoinsel ));
+DATA(insert OID = 1226 (  "~*"		 PGNSP PGUID b f	19	25	16 0 1227  0 0 0 0 nameicregexeq icregexeqsel icregexeqjoinsel ));
 #define OID_NAME_ICREGEXEQ_OP		1226
-DATA(insert OID = 1227 (  "!~*"		 PGNSP PGUID 0 b t f	19	25	16 0 1226  0 0 0 0 nameicregexne icregexnesel icregexnejoinsel ));
-DATA(insert OID = 1228 (  "~*"		 PGNSP PGUID 0 b t f	25	25	16 0 1229  0 0 0 0 texticregexeq icregexeqsel icregexeqjoinsel ));
+DATA(insert OID = 1227 (  "!~*"		 PGNSP PGUID b f	19	25	16 0 1226  0 0 0 0 nameicregexne icregexnesel icregexnejoinsel ));
+DATA(insert OID = 1228 (  "~*"		 PGNSP PGUID b f	25	25	16 0 1229  0 0 0 0 texticregexeq icregexeqsel icregexeqjoinsel ));
 #define OID_TEXT_ICREGEXEQ_OP		1228
-DATA(insert OID = 1229 (  "!~*"		 PGNSP PGUID 0 b t f	25	25	16 0 1228  0 0 0 0 texticregexne icregexnesel icregexnejoinsel ));
-DATA(insert OID = 1232 (  "~*"		PGNSP PGUID 0 b t f  1043  25  16 0 1233	0 0   0   0 texticregexeq icregexeqsel icregexeqjoinsel ));
+DATA(insert OID = 1229 (  "!~*"		 PGNSP PGUID b f	25	25	16 0 1228  0 0 0 0 texticregexne icregexnesel icregexnejoinsel ));
+DATA(insert OID = 1232 (  "~*"		PGNSP PGUID b f  1043  25  16 0 1233	0 0   0   0 texticregexeq icregexeqsel icregexeqjoinsel ));
 #define OID_VARCHAR_ICREGEXEQ_OP		1232
-DATA(insert OID = 1233 ( "!~*"		PGNSP PGUID 0 b t f  1043  25  16 0 1232	0 0   0   0 texticregexne icregexnesel icregexnejoinsel ));
-DATA(insert OID = 1234 (  "~*"		PGNSP PGUID 0 b t f  1042  25  16 0 1235	0 0   0   0 texticregexeq icregexeqsel icregexeqjoinsel ));
+DATA(insert OID = 1233 ( "!~*"		PGNSP PGUID b f  1043  25  16 0 1232	0 0   0   0 texticregexne icregexnesel icregexnejoinsel ));
+DATA(insert OID = 1234 (  "~*"		PGNSP PGUID b f  1042  25  16 0 1235	0 0   0   0 texticregexeq icregexeqsel icregexeqjoinsel ));
 #define OID_BPCHAR_ICREGEXEQ_OP		1234
-DATA(insert OID = 1235 ( "!~*"		PGNSP PGUID 0 b t f  1042  25  16 0 1234	0 0   0   0 texticregexne icregexnesel icregexnejoinsel ));
+DATA(insert OID = 1235 ( "!~*"		PGNSP PGUID b f  1042  25  16 0 1234	0 0   0   0 texticregexne icregexnesel icregexnejoinsel ));
 
 /* timestamptz operators */
-DATA(insert OID = 1320 (  "="	   PGNSP PGUID 0 b t f 1184 1184	 16 1320 1321 1322 1322 1322 1324 timestamp_eq eqsel eqjoinsel ));
-DATA(insert OID = 1321 (  "<>"	   PGNSP PGUID 0 b t f 1184 1184	 16 1321 1320 0 0 0 0 timestamp_ne neqsel neqjoinsel ));
-DATA(insert OID = 1322 (  "<"	   PGNSP PGUID 0 b t f 1184 1184	 16 1324 1325 0 0 0 0 timestamp_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1323 (  "<="	   PGNSP PGUID 0 b t f 1184 1184	 16 1325 1324 0 0 0 0 timestamp_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1324 (  ">"	   PGNSP PGUID 0 b t f 1184 1184	 16 1322 1323 0 0 0 0 timestamp_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1325 (  ">="	   PGNSP PGUID 0 b t f 1184 1184	 16 1323 1322 0 0 0 0 timestamp_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1327 (  "+"	   PGNSP PGUID 0 b t f 1184 1186 1184    0	0 0 0 0 0 timestamptz_pl_span - - ));
-DATA(insert OID = 1328 (  "-"	   PGNSP PGUID 0 b t f 1184 1184 1186    0	0 0 0 0 0 timestamptz_mi - - ));
-DATA(insert OID = 1329 (  "-"	   PGNSP PGUID 0 b t f 1184 1186 1184    0	0 0 0 0 0 timestamptz_mi_span - - ));
+DATA(insert OID = 1320 (  "="	   PGNSP PGUID b f 1184 1184	 16 1320 1321 1322 1322 1322 1324 timestamp_eq eqsel eqjoinsel ));
+DATA(insert OID = 1321 (  "<>"	   PGNSP PGUID b f 1184 1184	 16 1321 1320 0 0 0 0 timestamp_ne neqsel neqjoinsel ));
+DATA(insert OID = 1322 (  "<"	   PGNSP PGUID b f 1184 1184	 16 1324 1325 0 0 0 0 timestamp_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1323 (  "<="	   PGNSP PGUID b f 1184 1184	 16 1325 1324 0 0 0 0 timestamp_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1324 (  ">"	   PGNSP PGUID b f 1184 1184	 16 1322 1323 0 0 0 0 timestamp_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1325 (  ">="	   PGNSP PGUID b f 1184 1184	 16 1323 1322 0 0 0 0 timestamp_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1327 (  "+"	   PGNSP PGUID b f 1184 1186 1184    0	0 0 0 0 0 timestamptz_pl_span - - ));
+DATA(insert OID = 1328 (  "-"	   PGNSP PGUID b f 1184 1184 1186    0	0 0 0 0 0 timestamptz_mi - - ));
+DATA(insert OID = 1329 (  "-"	   PGNSP PGUID b f 1184 1186 1184    0	0 0 0 0 0 timestamptz_mi_span - - ));
 
 /* interval operators */
-DATA(insert OID = 1330 (  "="	   PGNSP PGUID 0 b t f 1186 1186	 16 1330 1331 1332 1332 1332 1334 interval_eq eqsel eqjoinsel ));
-DATA(insert OID = 1331 (  "<>"	   PGNSP PGUID 0 b t f 1186 1186	 16 1331 1330 0 0 0 0 interval_ne neqsel neqjoinsel ));
-DATA(insert OID = 1332 (  "<"	   PGNSP PGUID 0 b t f 1186 1186	 16 1334 1335 0 0 0 0 interval_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1333 (  "<="	   PGNSP PGUID 0 b t f 1186 1186	 16 1335 1334 0 0 0 0 interval_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1334 (  ">"	   PGNSP PGUID 0 b t f 1186 1186	 16 1332 1333 0 0 0 0 interval_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1335 (  ">="	   PGNSP PGUID 0 b t f 1186 1186	 16 1333 1332 0 0 0 0 interval_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1330 (  "="	   PGNSP PGUID b f 1186 1186	 16 1330 1331 1332 1332 1332 1334 interval_eq eqsel eqjoinsel ));
+DATA(insert OID = 1331 (  "<>"	   PGNSP PGUID b f 1186 1186	 16 1331 1330 0 0 0 0 interval_ne neqsel neqjoinsel ));
+DATA(insert OID = 1332 (  "<"	   PGNSP PGUID b f 1186 1186	 16 1334 1335 0 0 0 0 interval_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1333 (  "<="	   PGNSP PGUID b f 1186 1186	 16 1335 1334 0 0 0 0 interval_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1334 (  ">"	   PGNSP PGUID b f 1186 1186	 16 1332 1333 0 0 0 0 interval_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1335 (  ">="	   PGNSP PGUID b f 1186 1186	 16 1333 1332 0 0 0 0 interval_ge scalargtsel scalargtjoinsel ));
 
-DATA(insert OID = 1336 (  "-"	   PGNSP PGUID 0 l t f	0 1186 1186    0	0 0 0 0 0 interval_um - - ));
-DATA(insert OID = 1337 (  "+"	   PGNSP PGUID 0 b t f 1186 1186 1186 1337	0 0 0 0 0 interval_pl - - ));
-DATA(insert OID = 1338 (  "-"	   PGNSP PGUID 0 b t f 1186 1186 1186    0	0 0 0 0 0 interval_mi - - ));
+DATA(insert OID = 1336 (  "-"	   PGNSP PGUID l f	0 1186 1186    0	0 0 0 0 0 interval_um - - ));
+DATA(insert OID = 1337 (  "+"	   PGNSP PGUID b f 1186 1186 1186 1337	0 0 0 0 0 interval_pl - - ));
+DATA(insert OID = 1338 (  "-"	   PGNSP PGUID b f 1186 1186 1186    0	0 0 0 0 0 interval_mi - - ));
 
-DATA(insert OID = 1360 (  "+"	   PGNSP PGUID 0 b t f 1082 1083 1114    0	0 0 0 0 0 datetime_pl - - ));
-DATA(insert OID = 1361 (  "+"	   PGNSP PGUID 0 b t f 1082 1266 1184    0	0 0 0 0 0 datetimetz_pl - - ));
-DATA(insert OID = 1363 (  "+"	   PGNSP PGUID 0 b t f 1083 1082 1114    0	0 0 0 0 0 timedate_pl - - ));
-DATA(insert OID = 1366 (  "+"	   PGNSP PGUID 0 b t f 1266 1082 1184    0	0 0 0 0 0 timetzdate_pl - - ));
+DATA(insert OID = 1360 (  "+"	   PGNSP PGUID b f 1082 1083 1114    0	0 0 0 0 0 datetime_pl - - ));
+DATA(insert OID = 1361 (  "+"	   PGNSP PGUID b f 1082 1266 1184    0	0 0 0 0 0 datetimetz_pl - - ));
+DATA(insert OID = 1363 (  "+"	   PGNSP PGUID b f 1083 1082 1114    0	0 0 0 0 0 timedate_pl - - ));
+DATA(insert OID = 1366 (  "+"	   PGNSP PGUID b f 1266 1082 1184    0	0 0 0 0 0 timetzdate_pl - - ));
 
-DATA(insert OID = 1399 (  "-"	   PGNSP PGUID 0 b t f 1083 1083 1186    0	0 0 0 0 0 time_mi_time - - ));
+DATA(insert OID = 1399 (  "-"	   PGNSP PGUID b f 1083 1083 1186    0	0 0 0 0 0 time_mi_time - - ));
 
 /* additional geometric operators - thomas 97/04/18 */
-DATA(insert OID = 1420 (  "@@"	  PGNSP PGUID 0 l t f    0  718 600	  0    0	0	 0   0   0 circle_center - - ));
-DATA(insert OID = 1500 (  "="	  PGNSP PGUID 0 b t f  718  718	16 1500 1501 1502 1502 1502 1503 circle_eq eqsel eqjoinsel ));
-DATA(insert OID = 1501 (  "<>"	  PGNSP PGUID 0 b t f  718  718	16 1501 1500	0	 0   0   0 circle_ne neqsel neqjoinsel ));
-DATA(insert OID = 1502 (  "<"	  PGNSP PGUID 0 b t f  718  718	16 1503 1505	0	 0   0   0 circle_lt areasel areajoinsel ));
-DATA(insert OID = 1503 (  ">"	  PGNSP PGUID 0 b t f  718  718	16 1502 1504	0	 0   0   0 circle_gt areasel areajoinsel ));
-DATA(insert OID = 1504 (  "<="	  PGNSP PGUID 0 b t f  718  718	16 1505 1503	0	 0   0   0 circle_le areasel areajoinsel ));
-DATA(insert OID = 1505 (  ">="	  PGNSP PGUID 0 b t f  718  718	16 1504 1502	0	 0   0   0 circle_ge areasel areajoinsel ));
-
-DATA(insert OID = 1506 (  "<<"	  PGNSP PGUID 0 b t f  718  718	16	  0    0	0	 0   0   0 circle_left positionsel positionjoinsel ));
-DATA(insert OID = 1507 (  "&<"	  PGNSP PGUID 0 b t f  718  718	16	  0    0	0	 0   0   0 circle_overleft positionsel positionjoinsel ));
-DATA(insert OID = 1508 (  "&>"	  PGNSP PGUID 0 b t f  718  718	16	  0    0	0	 0   0   0 circle_overright positionsel positionjoinsel ));
-DATA(insert OID = 1509 (  ">>"	  PGNSP PGUID 0 b t f  718  718	16	  0    0	0	 0   0   0 circle_right positionsel positionjoinsel ));
-DATA(insert OID = 1510 (  "@"	  PGNSP PGUID 0 b t f  718  718	16 1511    0	0	 0   0   0 circle_contained contsel contjoinsel ));
-DATA(insert OID = 1511 (  "~"	  PGNSP PGUID 0 b t f  718  718	16 1510    0	0	 0   0   0 circle_contain contsel contjoinsel ));
-DATA(insert OID = 1512 (  "~="	  PGNSP PGUID 0 b t f  718  718	16 1512    0	0	 0   0   0 circle_same eqsel eqjoinsel ));
-DATA(insert OID = 1513 (  "&&"	  PGNSP PGUID 0 b t f  718  718	16 1513    0	0	 0   0   0 circle_overlap areasel areajoinsel ));
-DATA(insert OID = 1514 (  ">^"	  PGNSP PGUID 0 b t f  718  718	16	  0    0	0	 0   0   0 circle_above positionsel positionjoinsel ));
-DATA(insert OID = 1515 (  "<^"	  PGNSP PGUID 0 b t f  718  718	16	  0    0	0	 0   0   0 circle_below positionsel positionjoinsel ));
-
-DATA(insert OID = 1516 (  "+"	  PGNSP PGUID 0 b t f  718  600  718	  0    0	0	 0   0   0 circle_add_pt - - ));
-DATA(insert OID = 1517 (  "-"	  PGNSP PGUID 0 b t f  718  600  718	  0    0	0	 0   0   0 circle_sub_pt - - ));
-DATA(insert OID = 1518 (  "*"	  PGNSP PGUID 0 b t f  718  600  718	  0    0	0	 0   0   0 circle_mul_pt - - ));
-DATA(insert OID = 1519 (  "/"	  PGNSP PGUID 0 b t f  718  600  718	  0    0	0	 0   0   0 circle_div_pt - - ));
-
-DATA(insert OID = 1520 (  "<->"   PGNSP PGUID 0 b t f  718  718  701 1520    0	0	 0   0   0 circle_distance - - ));
-DATA(insert OID = 1521 (  "#"	  PGNSP PGUID 0 l t f    0  604	23	  0    0	0	 0   0   0 poly_npoints - - ));
-DATA(insert OID = 1522 (  "<->"   PGNSP PGUID 0 b t f  600  718  701	  0    0	0	 0   0   0 dist_pc - - ));
-DATA(insert OID = 1523 (  "<->"   PGNSP PGUID 0 b t f  718  604  701	  0    0	0	 0   0   0 dist_cpoly - - ));
+DATA(insert OID = 1420 (  "@@"	  PGNSP PGUID l f    0  718 600	  0    0	0	 0   0   0 circle_center - - ));
+DATA(insert OID = 1500 (  "="	  PGNSP PGUID b f  718  718	16 1500 1501 1502 1502 1502 1503 circle_eq eqsel eqjoinsel ));
+DATA(insert OID = 1501 (  "<>"	  PGNSP PGUID b f  718  718	16 1501 1500	0	 0   0   0 circle_ne neqsel neqjoinsel ));
+DATA(insert OID = 1502 (  "<"	  PGNSP PGUID b f  718  718	16 1503 1505	0	 0   0   0 circle_lt areasel areajoinsel ));
+DATA(insert OID = 1503 (  ">"	  PGNSP PGUID b f  718  718	16 1502 1504	0	 0   0   0 circle_gt areasel areajoinsel ));
+DATA(insert OID = 1504 (  "<="	  PGNSP PGUID b f  718  718	16 1505 1503	0	 0   0   0 circle_le areasel areajoinsel ));
+DATA(insert OID = 1505 (  ">="	  PGNSP PGUID b f  718  718	16 1504 1502	0	 0   0   0 circle_ge areasel areajoinsel ));
+
+DATA(insert OID = 1506 (  "<<"	  PGNSP PGUID b f  718  718	16	  0    0	0	 0   0   0 circle_left positionsel positionjoinsel ));
+DATA(insert OID = 1507 (  "&<"	  PGNSP PGUID b f  718  718	16	  0    0	0	 0   0   0 circle_overleft positionsel positionjoinsel ));
+DATA(insert OID = 1508 (  "&>"	  PGNSP PGUID b f  718  718	16	  0    0	0	 0   0   0 circle_overright positionsel positionjoinsel ));
+DATA(insert OID = 1509 (  ">>"	  PGNSP PGUID b f  718  718	16	  0    0	0	 0   0   0 circle_right positionsel positionjoinsel ));
+DATA(insert OID = 1510 (  "@"	  PGNSP PGUID b f  718  718	16 1511    0	0	 0   0   0 circle_contained contsel contjoinsel ));
+DATA(insert OID = 1511 (  "~"	  PGNSP PGUID b f  718  718	16 1510    0	0	 0   0   0 circle_contain contsel contjoinsel ));
+DATA(insert OID = 1512 (  "~="	  PGNSP PGUID b f  718  718	16 1512    0	0	 0   0   0 circle_same eqsel eqjoinsel ));
+DATA(insert OID = 1513 (  "&&"	  PGNSP PGUID b f  718  718	16 1513    0	0	 0   0   0 circle_overlap areasel areajoinsel ));
+DATA(insert OID = 1514 (  ">^"	  PGNSP PGUID b f  718  718	16	  0    0	0	 0   0   0 circle_above positionsel positionjoinsel ));
+DATA(insert OID = 1515 (  "<^"	  PGNSP PGUID b f  718  718	16	  0    0	0	 0   0   0 circle_below positionsel positionjoinsel ));
+
+DATA(insert OID = 1516 (  "+"	  PGNSP PGUID b f  718  600  718	  0    0	0	 0   0   0 circle_add_pt - - ));
+DATA(insert OID = 1517 (  "-"	  PGNSP PGUID b f  718  600  718	  0    0	0	 0   0   0 circle_sub_pt - - ));
+DATA(insert OID = 1518 (  "*"	  PGNSP PGUID b f  718  600  718	  0    0	0	 0   0   0 circle_mul_pt - - ));
+DATA(insert OID = 1519 (  "/"	  PGNSP PGUID b f  718  600  718	  0    0	0	 0   0   0 circle_div_pt - - ));
+
+DATA(insert OID = 1520 (  "<->"   PGNSP PGUID b f  718  718  701 1520    0	0	 0   0   0 circle_distance - - ));
+DATA(insert OID = 1521 (  "#"	  PGNSP PGUID l f    0  604	23	  0    0	0	 0   0   0 poly_npoints - - ));
+DATA(insert OID = 1522 (  "<->"   PGNSP PGUID b f  600  718  701	  0    0	0	 0   0   0 dist_pc - - ));
+DATA(insert OID = 1523 (  "<->"   PGNSP PGUID b f  718  604  701	  0    0	0	 0   0   0 dist_cpoly - - ));
 
 /* additional geometric operators - thomas 1997-07-09 */
-DATA(insert OID = 1524 (  "<->"   PGNSP PGUID 0 b t f  628  603  701	  0  0 0 0 0 0 dist_lb - - ));
-
-DATA(insert OID = 1525 (  "?#"	  PGNSP PGUID 0 b t f  601  601	16 1525  0 0 0 0 0 lseg_intersect - - ));
-DATA(insert OID = 1526 (  "?||"   PGNSP PGUID 0 b t f  601  601	16 1526  0 0 0 0 0 lseg_parallel - - ));
-DATA(insert OID = 1527 (  "?-|"   PGNSP PGUID 0 b t f  601  601	16 1527  0 0 0 0 0 lseg_perp - - ));
-DATA(insert OID = 1528 (  "?-"	  PGNSP PGUID 0 l t f    0  601	16	  0  0 0 0 0 0 lseg_horizontal - - ));
-DATA(insert OID = 1529 (  "?|"	  PGNSP PGUID 0 l t f    0  601	16	  0  0 0 0 0 0 lseg_vertical - - ));
-DATA(insert OID = 1535 (  "="	  PGNSP PGUID 0 b t f  601  601	16 1535 1586 0 0 0 0 lseg_eq eqsel eqjoinsel ));
-DATA(insert OID = 1536 (  "#"	  PGNSP PGUID 0 b t f  601  601  600 1536  0 0 0 0 0 lseg_interpt - - ));
-DATA(insert OID = 1537 (  "?#"	  PGNSP PGUID 0 b t f  601  628	16	  0  0 0 0 0 0 inter_sl - - ));
-DATA(insert OID = 1538 (  "?#"	  PGNSP PGUID 0 b t f  601  603	16	  0  0 0 0 0 0 inter_sb - - ));
-DATA(insert OID = 1539 (  "?#"	  PGNSP PGUID 0 b t f  628  603	16	  0  0 0 0 0 0 inter_lb - - ));
-
-DATA(insert OID = 1546 (  "@"	  PGNSP PGUID 0 b t f  600  628	16	  0  0 0 0 0 0 on_pl - - ));
-DATA(insert OID = 1547 (  "@"	  PGNSP PGUID 0 b t f  600  601	16	  0  0 0 0 0 0 on_ps - - ));
-DATA(insert OID = 1548 (  "@"	  PGNSP PGUID 0 b t f  601  628	16	  0  0 0 0 0 0 on_sl - - ));
-DATA(insert OID = 1549 (  "@"	  PGNSP PGUID 0 b t f  601  603	16	  0  0 0 0 0 0 on_sb - - ));
-
-DATA(insert OID = 1557 (  "##"	  PGNSP PGUID 0 b t f  600  628  600	  0  0 0 0 0 0 close_pl - - ));
-DATA(insert OID = 1558 (  "##"	  PGNSP PGUID 0 b t f  600  601  600	  0  0 0 0 0 0 close_ps - - ));
-DATA(insert OID = 1559 (  "##"	  PGNSP PGUID 0 b t f  600  603  600	  0  0 0 0 0 0 close_pb - - ));
-
-DATA(insert OID = 1566 (  "##"	  PGNSP PGUID 0 b t f  601  628  600	  0  0 0 0 0 0 close_sl - - ));
-DATA(insert OID = 1567 (  "##"	  PGNSP PGUID 0 b t f  601  603  600	  0  0 0 0 0 0 close_sb - - ));
-DATA(insert OID = 1568 (  "##"	  PGNSP PGUID 0 b t f  628  603  600	  0  0 0 0 0 0 close_lb - - ));
-DATA(insert OID = 1577 (  "##"	  PGNSP PGUID 0 b t f  628  601  600	  0  0 0 0 0 0 close_ls - - ));
-DATA(insert OID = 1578 (  "##"	  PGNSP PGUID 0 b t f  601  601  600	  0  0 0 0 0 0 close_lseg - - ));
-DATA(insert OID = 1583 (  "*"	  PGNSP PGUID 0 b t f 1186  701 1186	  0  0 0 0 0 0 interval_mul - - ));
-DATA(insert OID = 1584 (  "*"	  PGNSP PGUID 0 b t f  701 1186 1186	  0  0 0 0 0 0 mul_d_interval - - ));
-DATA(insert OID = 1585 (  "/"	  PGNSP PGUID 0 b t f 1186  701 1186	  0  0 0 0 0 0 interval_div - - ));
-
-DATA(insert OID = 1586 (  "<>"	  PGNSP PGUID 0 b t f  601  601	16 1586 1535 0 0 0 0 lseg_ne neqsel neqjoinsel ));
-DATA(insert OID = 1587 (  "<"	  PGNSP PGUID 0 b t f  601  601	16 1589 1590 0 0 0 0 lseg_lt - - ));
-DATA(insert OID = 1588 (  "<="	  PGNSP PGUID 0 b t f  601  601	16 1590 1589 0 0 0 0 lseg_le - - ));
-DATA(insert OID = 1589 (  ">"	  PGNSP PGUID 0 b t f  601  601	16 1587 1588 0 0 0 0 lseg_gt - - ));
-DATA(insert OID = 1590 (  ">="	  PGNSP PGUID 0 b t f  601  601	16 1588 1587 0 0 0 0 lseg_ge - - ));
-
-DATA(insert OID = 1591 (  "@-@"   PGNSP PGUID 0 l t f 0  601	701    0  0 0 0 0 0 lseg_length - - ));
-
-DATA(insert OID = 1611 (  "?#"	  PGNSP PGUID 0 b t f  628  628	16 1611  0 0 0 0 0 line_intersect - - ));
-DATA(insert OID = 1612 (  "?||"   PGNSP PGUID 0 b t f  628  628	16 1612  0 0 0 0 0 line_parallel - - ));
-DATA(insert OID = 1613 (  "?-|"   PGNSP PGUID 0 b t f  628  628	16 1613  0 0 0 0 0 line_perp - - ));
-DATA(insert OID = 1614 (  "?-"	  PGNSP PGUID 0 l t f    0  628	16	  0  0 0 0 0 0 line_horizontal - - ));
-DATA(insert OID = 1615 (  "?|"	  PGNSP PGUID 0 l t f    0  628	16	  0  0 0 0 0 0 line_vertical - - ));
-DATA(insert OID = 1616 (  "="	  PGNSP PGUID 0 b t f  628  628	16 1616  0 0 0 0 0 line_eq eqsel eqjoinsel ));
-DATA(insert OID = 1617 (  "#"	  PGNSP PGUID 0 b t f  628  628  600 1617  0 0 0 0 0 line_interpt - - ));
+DATA(insert OID = 1524 (  "<->"   PGNSP PGUID b f  628  603  701	  0  0 0 0 0 0 dist_lb - - ));
+
+DATA(insert OID = 1525 (  "?#"	  PGNSP PGUID b f  601  601	16 1525  0 0 0 0 0 lseg_intersect - - ));
+DATA(insert OID = 1526 (  "?||"   PGNSP PGUID b f  601  601	16 1526  0 0 0 0 0 lseg_parallel - - ));
+DATA(insert OID = 1527 (  "?-|"   PGNSP PGUID b f  601  601	16 1527  0 0 0 0 0 lseg_perp - - ));
+DATA(insert OID = 1528 (  "?-"	  PGNSP PGUID l f    0  601	16	  0  0 0 0 0 0 lseg_horizontal - - ));
+DATA(insert OID = 1529 (  "?|"	  PGNSP PGUID l f    0  601	16	  0  0 0 0 0 0 lseg_vertical - - ));
+DATA(insert OID = 1535 (  "="	  PGNSP PGUID b f  601  601	16 1535 1586 0 0 0 0 lseg_eq eqsel eqjoinsel ));
+DATA(insert OID = 1536 (  "#"	  PGNSP PGUID b f  601  601  600 1536  0 0 0 0 0 lseg_interpt - - ));
+DATA(insert OID = 1537 (  "?#"	  PGNSP PGUID b f  601  628	16	  0  0 0 0 0 0 inter_sl - - ));
+DATA(insert OID = 1538 (  "?#"	  PGNSP PGUID b f  601  603	16	  0  0 0 0 0 0 inter_sb - - ));
+DATA(insert OID = 1539 (  "?#"	  PGNSP PGUID b f  628  603	16	  0  0 0 0 0 0 inter_lb - - ));
+
+DATA(insert OID = 1546 (  "@"	  PGNSP PGUID b f  600  628	16	  0  0 0 0 0 0 on_pl - - ));
+DATA(insert OID = 1547 (  "@"	  PGNSP PGUID b f  600  601	16	  0  0 0 0 0 0 on_ps - - ));
+DATA(insert OID = 1548 (  "@"	  PGNSP PGUID b f  601  628	16	  0  0 0 0 0 0 on_sl - - ));
+DATA(insert OID = 1549 (  "@"	  PGNSP PGUID b f  601  603	16	  0  0 0 0 0 0 on_sb - - ));
+
+DATA(insert OID = 1557 (  "##"	  PGNSP PGUID b f  600  628  600	  0  0 0 0 0 0 close_pl - - ));
+DATA(insert OID = 1558 (  "##"	  PGNSP PGUID b f  600  601  600	  0  0 0 0 0 0 close_ps - - ));
+DATA(insert OID = 1559 (  "##"	  PGNSP PGUID b f  600  603  600	  0  0 0 0 0 0 close_pb - - ));
+
+DATA(insert OID = 1566 (  "##"	  PGNSP PGUID b f  601  628  600	  0  0 0 0 0 0 close_sl - - ));
+DATA(insert OID = 1567 (  "##"	  PGNSP PGUID b f  601  603  600	  0  0 0 0 0 0 close_sb - - ));
+DATA(insert OID = 1568 (  "##"	  PGNSP PGUID b f  628  603  600	  0  0 0 0 0 0 close_lb - - ));
+DATA(insert OID = 1577 (  "##"	  PGNSP PGUID b f  628  601  600	  0  0 0 0 0 0 close_ls - - ));
+DATA(insert OID = 1578 (  "##"	  PGNSP PGUID b f  601  601  600	  0  0 0 0 0 0 close_lseg - - ));
+DATA(insert OID = 1583 (  "*"	  PGNSP PGUID b f 1186  701 1186	  0  0 0 0 0 0 interval_mul - - ));
+DATA(insert OID = 1584 (  "*"	  PGNSP PGUID b f  701 1186 1186	  0  0 0 0 0 0 mul_d_interval - - ));
+DATA(insert OID = 1585 (  "/"	  PGNSP PGUID b f 1186  701 1186	  0  0 0 0 0 0 interval_div - - ));
+
+DATA(insert OID = 1586 (  "<>"	  PGNSP PGUID b f  601  601	16 1586 1535 0 0 0 0 lseg_ne neqsel neqjoinsel ));
+DATA(insert OID = 1587 (  "<"	  PGNSP PGUID b f  601  601	16 1589 1590 0 0 0 0 lseg_lt - - ));
+DATA(insert OID = 1588 (  "<="	  PGNSP PGUID b f  601  601	16 1590 1589 0 0 0 0 lseg_le - - ));
+DATA(insert OID = 1589 (  ">"	  PGNSP PGUID b f  601  601	16 1587 1588 0 0 0 0 lseg_gt - - ));
+DATA(insert OID = 1590 (  ">="	  PGNSP PGUID b f  601  601	16 1588 1587 0 0 0 0 lseg_ge - - ));
+
+DATA(insert OID = 1591 (  "@-@"   PGNSP PGUID l f 0  601	701    0  0 0 0 0 0 lseg_length - - ));
+
+DATA(insert OID = 1611 (  "?#"	  PGNSP PGUID b f  628  628	16 1611  0 0 0 0 0 line_intersect - - ));
+DATA(insert OID = 1612 (  "?||"   PGNSP PGUID b f  628  628	16 1612  0 0 0 0 0 line_parallel - - ));
+DATA(insert OID = 1613 (  "?-|"   PGNSP PGUID b f  628  628	16 1613  0 0 0 0 0 line_perp - - ));
+DATA(insert OID = 1614 (  "?-"	  PGNSP PGUID l f    0  628	16	  0  0 0 0 0 0 line_horizontal - - ));
+DATA(insert OID = 1615 (  "?|"	  PGNSP PGUID l f    0  628	16	  0  0 0 0 0 0 line_vertical - - ));
+DATA(insert OID = 1616 (  "="	  PGNSP PGUID b f  628  628	16 1616  0 0 0 0 0 line_eq eqsel eqjoinsel ));
+DATA(insert OID = 1617 (  "#"	  PGNSP PGUID b f  628  628  600 1617  0 0 0 0 0 line_interpt - - ));
 
 /* MAC type */
-DATA(insert OID = 1220 (  "="	   PGNSP PGUID 0 b t f 829 829	 16 1220 1221 1222 1222 1222 1224 macaddr_eq eqsel eqjoinsel ));
-DATA(insert OID = 1221 (  "<>"	   PGNSP PGUID 0 b t f 829 829	 16 1221 1220	 0	  0   0   0 macaddr_ne neqsel neqjoinsel ));
-DATA(insert OID = 1222 (  "<"	   PGNSP PGUID 0 b t f 829 829	 16 1224 1225	 0	  0   0   0 macaddr_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1223 (  "<="	   PGNSP PGUID 0 b t f 829 829	 16 1225 1224	 0	  0   0   0 macaddr_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1224 (  ">"	   PGNSP PGUID 0 b t f 829 829	 16 1222 1223	 0	  0   0   0 macaddr_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1225 (  ">="	   PGNSP PGUID 0 b t f 829 829	 16 1223 1222	 0	  0   0   0 macaddr_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1220 (  "="	   PGNSP PGUID b f 829 829	 16 1220 1221 1222 1222 1222 1224 macaddr_eq eqsel eqjoinsel ));
+DATA(insert OID = 1221 (  "<>"	   PGNSP PGUID b f 829 829	 16 1221 1220	 0	  0   0   0 macaddr_ne neqsel neqjoinsel ));
+DATA(insert OID = 1222 (  "<"	   PGNSP PGUID b f 829 829	 16 1224 1225	 0	  0   0   0 macaddr_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1223 (  "<="	   PGNSP PGUID b f 829 829	 16 1225 1224	 0	  0   0   0 macaddr_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1224 (  ">"	   PGNSP PGUID b f 829 829	 16 1222 1223	 0	  0   0   0 macaddr_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1225 (  ">="	   PGNSP PGUID b f 829 829	 16 1223 1222	 0	  0   0   0 macaddr_ge scalargtsel scalargtjoinsel ));
 
 /* INET type */
-DATA(insert OID = 1201 (  "="	   PGNSP PGUID 0 b t f 869 869	 16 1201 1202 1203 1203 1203 1205 network_eq eqsel eqjoinsel ));
-DATA(insert OID = 1202 (  "<>"	   PGNSP PGUID 0 b t f 869 869	 16 1202 1201	 0	  0   0   0 network_ne neqsel neqjoinsel ));
-DATA(insert OID = 1203 (  "<"	   PGNSP PGUID 0 b t f 869 869	 16 1205 1206	 0	  0   0   0 network_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1204 (  "<="	   PGNSP PGUID 0 b t f 869 869	 16 1206 1205	 0	  0   0   0 network_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1205 (  ">"	   PGNSP PGUID 0 b t f 869 869	 16 1203 1204	 0	  0   0   0 network_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1206 (  ">="	   PGNSP PGUID 0 b t f 869 869	 16 1204 1203	 0	  0   0   0 network_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 931  (  "<<"	   PGNSP PGUID 0 b t f 869 869	 16 933		0	 0	  0   0   0 network_sub - - ));
+DATA(insert OID = 1201 (  "="	   PGNSP PGUID b f 869 869	 16 1201 1202 1203 1203 1203 1205 network_eq eqsel eqjoinsel ));
+DATA(insert OID = 1202 (  "<>"	   PGNSP PGUID b f 869 869	 16 1202 1201	 0	  0   0   0 network_ne neqsel neqjoinsel ));
+DATA(insert OID = 1203 (  "<"	   PGNSP PGUID b f 869 869	 16 1205 1206	 0	  0   0   0 network_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1204 (  "<="	   PGNSP PGUID b f 869 869	 16 1206 1205	 0	  0   0   0 network_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1205 (  ">"	   PGNSP PGUID b f 869 869	 16 1203 1204	 0	  0   0   0 network_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1206 (  ">="	   PGNSP PGUID b f 869 869	 16 1204 1203	 0	  0   0   0 network_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 931  (  "<<"	   PGNSP PGUID b f 869 869	 16 933		0	 0	  0   0   0 network_sub - - ));
 #define OID_INET_SUB_OP				  931
-DATA(insert OID = 932  (  "<<="    PGNSP PGUID 0 b t f 869 869	 16 934		0	 0	  0   0   0 network_subeq - - ));
+DATA(insert OID = 932  (  "<<="    PGNSP PGUID b f 869 869	 16 934		0	 0	  0   0   0 network_subeq - - ));
 #define OID_INET_SUBEQ_OP				932
-DATA(insert OID = 933  (  ">>"	   PGNSP PGUID 0 b t f 869 869	 16 931		0	 0	  0   0   0 network_sup - - ));
+DATA(insert OID = 933  (  ">>"	   PGNSP PGUID b f 869 869	 16 931		0	 0	  0   0   0 network_sup - - ));
 #define OID_INET_SUP_OP				  933
-DATA(insert OID = 934  (  ">>="    PGNSP PGUID 0 b t f 869 869	 16 932		0	 0	  0   0   0 network_supeq - - ));
+DATA(insert OID = 934  (  ">>="    PGNSP PGUID b f 869 869	 16 932		0	 0	  0   0   0 network_supeq - - ));
 #define OID_INET_SUPEQ_OP				934
 
 /* CIDR type */
-DATA(insert OID = 820 (  "="	   PGNSP PGUID 0 b t f 650 650	 16 820 821 822 822 822 824 network_eq eqsel eqjoinsel ));
-DATA(insert OID = 821 (  "<>"	   PGNSP PGUID 0 b t f 650 650	 16 821 820   0   0   0   0 network_ne neqsel neqjoinsel ));
-DATA(insert OID = 822 (  "<"	   PGNSP PGUID 0 b t f 650 650	 16 824 825   0   0   0   0 network_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 823 (  "<="	   PGNSP PGUID 0 b t f 650 650	 16 825 824   0   0   0   0 network_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 824 (  ">"	   PGNSP PGUID 0 b t f 650 650	 16 822 823   0   0   0   0 network_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 825 (  ">="	   PGNSP PGUID 0 b t f 650 650	 16 823 822   0   0   0   0 network_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 826 (  "<<"	   PGNSP PGUID 0 b t f 650 650	 16 828   0   0   0   0   0 network_sub - - ));
+DATA(insert OID = 820 (  "="	   PGNSP PGUID b f 650 650	 16 820 821 822 822 822 824 network_eq eqsel eqjoinsel ));
+DATA(insert OID = 821 (  "<>"	   PGNSP PGUID b f 650 650	 16 821 820   0   0   0   0 network_ne neqsel neqjoinsel ));
+DATA(insert OID = 822 (  "<"	   PGNSP PGUID b f 650 650	 16 824 825   0   0   0   0 network_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 823 (  "<="	   PGNSP PGUID b f 650 650	 16 825 824   0   0   0   0 network_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 824 (  ">"	   PGNSP PGUID b f 650 650	 16 822 823   0   0   0   0 network_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 825 (  ">="	   PGNSP PGUID b f 650 650	 16 823 822   0   0   0   0 network_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 826 (  "<<"	   PGNSP PGUID b f 650 650	 16 828   0   0   0   0   0 network_sub - - ));
 #define OID_CIDR_SUB_OP		826
-DATA(insert OID = 827 (  "<<="	   PGNSP PGUID 0 b t f 650 650	 16 1004  0   0   0   0   0 network_subeq - - ));
+DATA(insert OID = 827 (  "<<="	   PGNSP PGUID b f 650 650	 16 1004  0   0   0   0   0 network_subeq - - ));
 #define OID_CIDR_SUBEQ_OP	827
-DATA(insert OID = 828 (  ">>"	   PGNSP PGUID 0 b t f 650 650	 16 826   0   0   0   0   0 network_sup - - ));
+DATA(insert OID = 828 (  ">>"	   PGNSP PGUID b f 650 650	 16 826   0   0   0   0   0 network_sup - - ));
 #define OID_CIDR_SUP_OP		828
-DATA(insert OID = 1004 ( ">>="	   PGNSP PGUID 0 b t f 650 650	 16 827   0   0   0   0   0 network_supeq - - ));
+DATA(insert OID = 1004 ( ">>="	   PGNSP PGUID b f 650 650	 16 827   0   0   0   0   0 network_supeq - - ));
 #define OID_CIDR_SUPEQ_OP	1004
 
 /* case-insensitive LIKE hacks */
-DATA(insert OID = 1625 (  "~~*"   PGNSP PGUID 0 b t f  19   25  16 0 1626 0 0 0 0 nameiclike iclikesel iclikejoinsel ));
+DATA(insert OID = 1625 (  "~~*"   PGNSP PGUID b f  19   25  16 0 1626 0 0 0 0 nameiclike iclikesel iclikejoinsel ));
 #define OID_NAME_ICLIKE_OP		1625
-DATA(insert OID = 1626 (  "!~~*"  PGNSP PGUID 0 b t f  19   25  16 0 1625 0 0 0 0 nameicnlike icnlikesel icnlikejoinsel ));
-DATA(insert OID = 1627 (  "~~*"   PGNSP PGUID 0 b t f  25   25  16 0 1628 0 0 0 0 texticlike iclikesel iclikejoinsel ));
+DATA(insert OID = 1626 (  "!~~*"  PGNSP PGUID b f  19   25  16 0 1625 0 0 0 0 nameicnlike icnlikesel icnlikejoinsel ));
+DATA(insert OID = 1627 (  "~~*"   PGNSP PGUID b f  25   25  16 0 1628 0 0 0 0 texticlike iclikesel iclikejoinsel ));
 #define OID_TEXT_ICLIKE_OP		1627
-DATA(insert OID = 1628 (  "!~~*"  PGNSP PGUID 0 b t f  25   25  16 0 1627 0 0 0 0 texticnlike icnlikesel icnlikejoinsel ));
-DATA(insert OID = 1629 (  "~~*"   PGNSP PGUID 0 b t f  1042 25  16 0 1630 0 0 0 0 texticlike iclikesel iclikejoinsel ));
+DATA(insert OID = 1628 (  "!~~*"  PGNSP PGUID b f  25   25  16 0 1627 0 0 0 0 texticnlike icnlikesel icnlikejoinsel ));
+DATA(insert OID = 1629 (  "~~*"   PGNSP PGUID b f  1042 25  16 0 1630 0 0 0 0 texticlike iclikesel iclikejoinsel ));
 #define OID_BPCHAR_ICLIKE_OP	1629
-DATA(insert OID = 1630 (  "!~~*"  PGNSP PGUID 0 b t f  1042 25  16 0 1629 0 0 0 0 texticnlike icnlikesel icnlikejoinsel ));
-DATA(insert OID = 1631 (  "~~*"   PGNSP PGUID 0 b t f  1043 25  16 0 1632 0 0 0 0 texticlike iclikesel iclikejoinsel ));
+DATA(insert OID = 1630 (  "!~~*"  PGNSP PGUID b f  1042 25  16 0 1629 0 0 0 0 texticnlike icnlikesel icnlikejoinsel ));
+DATA(insert OID = 1631 (  "~~*"   PGNSP PGUID b f  1043 25  16 0 1632 0 0 0 0 texticlike iclikesel iclikejoinsel ));
 #define OID_VARCHAR_ICLIKE_OP	1631
-DATA(insert OID = 1632 (  "!~~*"  PGNSP PGUID 0 b t f  1043 25  16 0 1631 0 0 0 0 texticnlike icnlikesel icnlikejoinsel ));
+DATA(insert OID = 1632 (  "!~~*"  PGNSP PGUID b f  1043 25  16 0 1631 0 0 0 0 texticnlike icnlikesel icnlikejoinsel ));
 
 /* int4 vs oid comparisons --- use oid (unsigned) comparison */
-DATA(insert OID = 1656 (  "<>"	   PGNSP PGUID 0 b t f  23  26  16 1661 1136	0  0   0   0 oidne neqsel neqjoinsel ));
-DATA(insert OID = 1657 (  "<"	   PGNSP PGUID 0 b t f  23  26  16 1663 1660	0  0   0   0 oidlt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1658 (  ">"	   PGNSP PGUID 0 b t f  23  26  16 1662 1659	0  0   0   0 oidgt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1659 (  "<="	   PGNSP PGUID 0 b t f  23  26  16 1665 1658	0  0   0   0 oidle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1660 (  ">="	   PGNSP PGUID 0 b t f  23  26  16 1664 1657	0  0   0   0 oidge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1661 (  "<>"	   PGNSP PGUID 0 b t f  26  23  16 1656 1137	0  0   0   0 oidne neqsel neqjoinsel ));
-DATA(insert OID = 1662 (  "<"	   PGNSP PGUID 0 b t f  26  23  16 1658 1665	0  0   0   0 oidlt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1663 (  ">"	   PGNSP PGUID 0 b t f  26  23  16 1657 1664	0  0   0   0 oidgt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1664 (  "<="	   PGNSP PGUID 0 b t f  26  23  16 1660 1663	0  0   0   0 oidle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1665 (  ">="	   PGNSP PGUID 0 b t f  26  23  16 1659 1662	0  0   0   0 oidge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1656 (  "<>"	   PGNSP PGUID b f  23  26  16 1661 1136	0  0   0   0 oidne neqsel neqjoinsel ));
+DATA(insert OID = 1657 (  "<"	   PGNSP PGUID b f  23  26  16 1663 1660	0  0   0   0 oidlt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1658 (  ">"	   PGNSP PGUID b f  23  26  16 1662 1659	0  0   0   0 oidgt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1659 (  "<="	   PGNSP PGUID b f  23  26  16 1665 1658	0  0   0   0 oidle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1660 (  ">="	   PGNSP PGUID b f  23  26  16 1664 1657	0  0   0   0 oidge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1661 (  "<>"	   PGNSP PGUID b f  26  23  16 1656 1137	0  0   0   0 oidne neqsel neqjoinsel ));
+DATA(insert OID = 1662 (  "<"	   PGNSP PGUID b f  26  23  16 1658 1665	0  0   0   0 oidlt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1663 (  ">"	   PGNSP PGUID b f  26  23  16 1657 1664	0  0   0   0 oidgt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1664 (  "<="	   PGNSP PGUID b f  26  23  16 1660 1663	0  0   0   0 oidle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1665 (  ">="	   PGNSP PGUID b f  26  23  16 1659 1662	0  0   0   0 oidge scalargtsel scalargtjoinsel ));
 
 /* NUMERIC type - OID's 1700-1799 */
-DATA(insert OID = 1751 (  "-"	   PGNSP PGUID 0 l t f	0 1700 1700    0	0 0 0 0 0 numeric_uminus - - ));
-DATA(insert OID = 1752 (  "="	   PGNSP PGUID 0 b t f 1700 1700	 16 1752 1753 1754 1754 1754 1756 numeric_eq eqsel eqjoinsel ));
-DATA(insert OID = 1753 (  "<>"	   PGNSP PGUID 0 b t f 1700 1700	 16 1753 1752 0 0 0 0 numeric_ne neqsel neqjoinsel ));
-DATA(insert OID = 1754 (  "<"	   PGNSP PGUID 0 b t f 1700 1700	 16 1756 1757 0 0 0 0 numeric_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1755 (  "<="	   PGNSP PGUID 0 b t f 1700 1700	 16 1757 1756 0 0 0 0 numeric_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1756 (  ">"	   PGNSP PGUID 0 b t f 1700 1700	 16 1754 1755 0 0 0 0 numeric_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1757 (  ">="	   PGNSP PGUID 0 b t f 1700 1700	 16 1755 1754 0 0 0 0 numeric_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1758 (  "+"	   PGNSP PGUID 0 b t f 1700 1700 1700 1758	0 0 0 0 0 numeric_add - - ));
-DATA(insert OID = 1759 (  "-"	   PGNSP PGUID 0 b t f 1700 1700 1700    0	0 0 0 0 0 numeric_sub - - ));
-DATA(insert OID = 1760 (  "*"	   PGNSP PGUID 0 b t f 1700 1700 1700 1760	0 0 0 0 0 numeric_mul - - ));
-DATA(insert OID = 1761 (  "/"	   PGNSP PGUID 0 b t f 1700 1700 1700    0	0 0 0 0 0 numeric_div - - ));
-DATA(insert OID = 1762 (  "%"	   PGNSP PGUID 0 b t f 1700 1700 1700    0	0 0 0 0 0 numeric_mod - - ));
-DATA(insert OID = 1763 (  "@"	   PGNSP PGUID 0 l t f	0 1700 1700    0	0 0 0 0 0 numeric_abs - - ));
-
-DATA(insert OID = 1784 (  "="	  PGNSP PGUID 0 b t f 1560 1560	16 1784 1785 1786 1786 1786 1787 biteq eqsel eqjoinsel ));
-DATA(insert OID = 1785 (  "<>"	  PGNSP PGUID 0 b t f 1560 1560	16 1785 1784	0	 0   0   0 bitne neqsel neqjoinsel ));
-DATA(insert OID = 1786 (  "<"	  PGNSP PGUID 0 b t f 1560 1560	16 1787 1789	0	 0   0   0 bitlt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1787 (  ">"	  PGNSP PGUID 0 b t f 1560 1560	16 1786 1788	0	 0   0   0 bitgt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1788 (  "<="	  PGNSP PGUID 0 b t f 1560 1560	16 1789 1787	0	 0   0   0 bitle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1789 (  ">="	  PGNSP PGUID 0 b t f 1560 1560	16 1788 1786	0	 0   0   0 bitge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1791 (  "&"	  PGNSP PGUID 0 b t f 1560 1560 1560 1791    0	0	 0   0   0 bitand - - ));
-DATA(insert OID = 1792 (  "|"	  PGNSP PGUID 0 b t f 1560 1560 1560 1792    0	0	 0   0   0 bitor - - ));
-DATA(insert OID = 1793 (  "#"	  PGNSP PGUID 0 b t f 1560 1560 1560 1793    0	0	 0   0   0 bitxor - - ));
-DATA(insert OID = 1794 (  "~"	  PGNSP PGUID 0 l t f    0 1560 1560	  0    0	0	 0   0   0 bitnot - - ));
-DATA(insert OID = 1795 (  "<<"	  PGNSP PGUID 0 b t f 1560   23 1560	  0    0	0	 0   0   0 bitshiftleft - - ));
-DATA(insert OID = 1796 (  ">>"	  PGNSP PGUID 0 b t f 1560   23 1560	  0    0	0	 0   0   0 bitshiftright - - ));
-DATA(insert OID = 1797 (  "||"	  PGNSP PGUID 0 b t f 1560 1560 1560	  0    0	0	 0   0   0 bitcat - - ));
-
-DATA(insert OID = 1800 (  "+"	   PGNSP PGUID 0 b t f 1083 1186 1083    0	0 0 0 0 0 time_pl_interval - - ));
-DATA(insert OID = 1801 (  "-"	   PGNSP PGUID 0 b t f 1083 1186 1083    0	0 0 0 0 0 time_mi_interval - - ));
-DATA(insert OID = 1802 (  "+"	   PGNSP PGUID 0 b t f 1266 1186 1266    0	0 0 0 0 0 timetz_pl_interval - - ));
-DATA(insert OID = 1803 (  "-"	   PGNSP PGUID 0 b t f 1266 1186 1266    0	0 0 0 0 0 timetz_mi_interval - - ));
-
-DATA(insert OID = 1804 (  "="	  PGNSP PGUID 0 b t f 1562 1562	16 1804 1805 1806 1806 1806 1807 varbiteq eqsel eqjoinsel ));
-DATA(insert OID = 1805 (  "<>"	  PGNSP PGUID 0 b t f 1562 1562	16 1805 1804	0	 0   0   0 varbitne neqsel neqjoinsel ));
-DATA(insert OID = 1806 (  "<"	  PGNSP PGUID 0 b t f 1562 1562	16 1807 1809	0	 0   0   0 varbitlt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1807 (  ">"	  PGNSP PGUID 0 b t f 1562 1562	16 1806 1808	0	 0   0   0 varbitgt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1808 (  "<="	  PGNSP PGUID 0 b t f 1562 1562	16 1809 1807	0	 0   0   0 varbitle scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1809 (  ">="	  PGNSP PGUID 0 b t f 1562 1562	16 1808 1806	0	 0   0   0 varbitge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID = 1849 (  "+"	   PGNSP PGUID 0 b t f 1186 1083 1083    0	0 0 0 0 0 interval_pl_time - - ));
-
-DATA(insert OID = 1862 ( "="	   PGNSP PGUID 0 b t f  21  20  16 1868  1863  95 412 1864 1865 int28eq eqsel eqjoinsel ));
-DATA(insert OID = 1863 ( "<>"	   PGNSP PGUID 0 b t f  21  20  16 1869  1862   0   0   0   0 int28ne neqsel neqjoinsel ));
-DATA(insert OID = 1864 ( "<"	   PGNSP PGUID 0 b t f  21  20  16 1871  1867   0   0   0   0 int28lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1865 ( ">"	   PGNSP PGUID 0 b t f  21  20  16 1870  1866   0   0   0   0 int28gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1866 ( "<="	   PGNSP PGUID 0 b t f  21  20  16 1873  1865   0   0   0   0 int28le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1867 ( ">="	   PGNSP PGUID 0 b t f  21  20  16 1872  1864   0   0   0   0 int28ge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID = 1868 ( "="	   PGNSP PGUID 0 b t f  20  21  16  1862 1869 412 95 1870 1871 int82eq eqsel eqjoinsel ));
-DATA(insert OID = 1869 ( "<>"	   PGNSP PGUID 0 b t f  20  21  16  1863 1868   0  0   0   0 int82ne neqsel neqjoinsel ));
-DATA(insert OID = 1870 ( "<"	   PGNSP PGUID 0 b t f  20  21  16  1865 1873   0  0   0   0 int82lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1871 ( ">"	   PGNSP PGUID 0 b t f  20  21  16  1864 1872   0  0   0   0 int82gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1872 ( "<="	   PGNSP PGUID 0 b t f  20  21  16  1867 1871   0  0   0   0 int82le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1873 ( ">="	   PGNSP PGUID 0 b t f  20  21  16  1866 1870   0  0   0   0 int82ge scalargtsel scalargtjoinsel ));
-
-DATA(insert OID = 1874 ( "&"	   PGNSP PGUID 0 b t f  21  21  21  1874	  0   0  0   0   0 int2and - - ));
-DATA(insert OID = 1875 ( "|"	   PGNSP PGUID 0 b t f  21  21  21  1875	  0   0  0   0   0 int2or - - ));
-DATA(insert OID = 1876 ( "#"	   PGNSP PGUID 0 b t f  21  21  21  1876	  0   0  0   0   0 int2xor - - ));
-DATA(insert OID = 1877 ( "~"	   PGNSP PGUID 0 l t f   0  21  21	 0	  0   0  0   0   0 int2not - - ));
-DATA(insert OID = 1878 ( "<<"	   PGNSP PGUID 0 b t f  21  23  21	 0	  0   0  0   0   0 int2shl - - ));
-DATA(insert OID = 1879 ( ">>"	   PGNSP PGUID 0 b t f  21  23  21	 0	  0   0  0   0   0 int2shr - - ));
-
-DATA(insert OID = 1880 ( "&"	   PGNSP PGUID 0 b t f  23  23  23  1880	  0   0  0   0   0 int4and - - ));
-DATA(insert OID = 1881 ( "|"	   PGNSP PGUID 0 b t f  23  23  23  1881	  0   0  0   0   0 int4or - - ));
-DATA(insert OID = 1882 ( "#"	   PGNSP PGUID 0 b t f  23  23  23  1882	  0   0  0   0   0 int4xor - - ));
-DATA(insert OID = 1883 ( "~"	   PGNSP PGUID 0 l t f   0  23  23	 0	  0   0  0   0   0 int4not - - ));
-DATA(insert OID = 1884 ( "<<"	   PGNSP PGUID 0 b t f  23  23  23	 0	  0   0  0   0   0 int4shl - - ));
-DATA(insert OID = 1885 ( ">>"	   PGNSP PGUID 0 b t f  23  23  23	 0	  0   0  0   0   0 int4shr - - ));
-
-DATA(insert OID = 1886 ( "&"	   PGNSP PGUID 0 b t f  20  20  20  1886	  0   0  0   0   0 int8and - - ));
-DATA(insert OID = 1887 ( "|"	   PGNSP PGUID 0 b t f  20  20  20  1887	  0   0  0   0   0 int8or - - ));
-DATA(insert OID = 1888 ( "#"	   PGNSP PGUID 0 b t f  20  20  20  1888	  0   0  0   0   0 int8xor - - ));
-DATA(insert OID = 1889 ( "~"	   PGNSP PGUID 0 l t f   0  20  20	 0	  0   0  0   0   0 int8not - - ));
-DATA(insert OID = 1890 ( "<<"	   PGNSP PGUID 0 b t f  20  23  20	 0	  0   0  0   0   0 int8shl - - ));
-DATA(insert OID = 1891 ( ">>"	   PGNSP PGUID 0 b t f  20  23  20	 0	  0   0  0   0   0 int8shr - - ));
-
-DATA(insert OID = 1916 (  "+"	   PGNSP PGUID 0 l t f   0  20  20	0	0	0	0   0   0 int8up - - ));
-DATA(insert OID = 1917 (  "+"	   PGNSP PGUID 0 l t f   0  21  21	0	0	0	0   0   0 int2up - - ));
-DATA(insert OID = 1918 (  "+"	   PGNSP PGUID 0 l t f   0  23  23	0	0	0	0   0   0 int4up - - ));
-DATA(insert OID = 1919 (  "+"	   PGNSP PGUID 0 l t f   0  700 700	0	0	0	0   0   0 float4up - - ));
-DATA(insert OID = 1920 (  "+"	   PGNSP PGUID 0 l t f   0  701 701	0	0	0	0   0   0 float8up - - ));
-DATA(insert OID = 1921 (  "+"	   PGNSP PGUID 0 l t f   0 1700 1700	0	0	0	0   0   0 numeric_uplus - - ));
+DATA(insert OID = 1751 (  "-"	   PGNSP PGUID l f	0 1700 1700    0	0 0 0 0 0 numeric_uminus - - ));
+DATA(insert OID = 1752 (  "="	   PGNSP PGUID b f 1700 1700	 16 1752 1753 1754 1754 1754 1756 numeric_eq eqsel eqjoinsel ));
+DATA(insert OID = 1753 (  "<>"	   PGNSP PGUID b f 1700 1700	 16 1753 1752 0 0 0 0 numeric_ne neqsel neqjoinsel ));
+DATA(insert OID = 1754 (  "<"	   PGNSP PGUID b f 1700 1700	 16 1756 1757 0 0 0 0 numeric_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1755 (  "<="	   PGNSP PGUID b f 1700 1700	 16 1757 1756 0 0 0 0 numeric_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1756 (  ">"	   PGNSP PGUID b f 1700 1700	 16 1754 1755 0 0 0 0 numeric_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1757 (  ">="	   PGNSP PGUID b f 1700 1700	 16 1755 1754 0 0 0 0 numeric_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1758 (  "+"	   PGNSP PGUID b f 1700 1700 1700 1758	0 0 0 0 0 numeric_add - - ));
+DATA(insert OID = 1759 (  "-"	   PGNSP PGUID b f 1700 1700 1700    0	0 0 0 0 0 numeric_sub - - ));
+DATA(insert OID = 1760 (  "*"	   PGNSP PGUID b f 1700 1700 1700 1760	0 0 0 0 0 numeric_mul - - ));
+DATA(insert OID = 1761 (  "/"	   PGNSP PGUID b f 1700 1700 1700    0	0 0 0 0 0 numeric_div - - ));
+DATA(insert OID = 1762 (  "%"	   PGNSP PGUID b f 1700 1700 1700    0	0 0 0 0 0 numeric_mod - - ));
+DATA(insert OID = 1763 (  "@"	   PGNSP PGUID l f	0 1700 1700    0	0 0 0 0 0 numeric_abs - - ));
+
+DATA(insert OID = 1784 (  "="	  PGNSP PGUID b f 1560 1560	16 1784 1785 1786 1786 1786 1787 biteq eqsel eqjoinsel ));
+DATA(insert OID = 1785 (  "<>"	  PGNSP PGUID b f 1560 1560	16 1785 1784	0	 0   0   0 bitne neqsel neqjoinsel ));
+DATA(insert OID = 1786 (  "<"	  PGNSP PGUID b f 1560 1560	16 1787 1789	0	 0   0   0 bitlt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1787 (  ">"	  PGNSP PGUID b f 1560 1560	16 1786 1788	0	 0   0   0 bitgt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1788 (  "<="	  PGNSP PGUID b f 1560 1560	16 1789 1787	0	 0   0   0 bitle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1789 (  ">="	  PGNSP PGUID b f 1560 1560	16 1788 1786	0	 0   0   0 bitge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1791 (  "&"	  PGNSP PGUID b f 1560 1560 1560 1791    0	0	 0   0   0 bitand - - ));
+DATA(insert OID = 1792 (  "|"	  PGNSP PGUID b f 1560 1560 1560 1792    0	0	 0   0   0 bitor - - ));
+DATA(insert OID = 1793 (  "#"	  PGNSP PGUID b f 1560 1560 1560 1793    0	0	 0   0   0 bitxor - - ));
+DATA(insert OID = 1794 (  "~"	  PGNSP PGUID l f    0 1560 1560	  0    0	0	 0   0   0 bitnot - - ));
+DATA(insert OID = 1795 (  "<<"	  PGNSP PGUID b f 1560   23 1560	  0    0	0	 0   0   0 bitshiftleft - - ));
+DATA(insert OID = 1796 (  ">>"	  PGNSP PGUID b f 1560   23 1560	  0    0	0	 0   0   0 bitshiftright - - ));
+DATA(insert OID = 1797 (  "||"	  PGNSP PGUID b f 1560 1560 1560	  0    0	0	 0   0   0 bitcat - - ));
+
+DATA(insert OID = 1800 (  "+"	   PGNSP PGUID b f 1083 1186 1083    0	0 0 0 0 0 time_pl_interval - - ));
+DATA(insert OID = 1801 (  "-"	   PGNSP PGUID b f 1083 1186 1083    0	0 0 0 0 0 time_mi_interval - - ));
+DATA(insert OID = 1802 (  "+"	   PGNSP PGUID b f 1266 1186 1266    0	0 0 0 0 0 timetz_pl_interval - - ));
+DATA(insert OID = 1803 (  "-"	   PGNSP PGUID b f 1266 1186 1266    0	0 0 0 0 0 timetz_mi_interval - - ));
+
+DATA(insert OID = 1804 (  "="	  PGNSP PGUID b f 1562 1562	16 1804 1805 1806 1806 1806 1807 varbiteq eqsel eqjoinsel ));
+DATA(insert OID = 1805 (  "<>"	  PGNSP PGUID b f 1562 1562	16 1805 1804	0	 0   0   0 varbitne neqsel neqjoinsel ));
+DATA(insert OID = 1806 (  "<"	  PGNSP PGUID b f 1562 1562	16 1807 1809	0	 0   0   0 varbitlt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1807 (  ">"	  PGNSP PGUID b f 1562 1562	16 1806 1808	0	 0   0   0 varbitgt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1808 (  "<="	  PGNSP PGUID b f 1562 1562	16 1809 1807	0	 0   0   0 varbitle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1809 (  ">="	  PGNSP PGUID b f 1562 1562	16 1808 1806	0	 0   0   0 varbitge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID = 1849 (  "+"	   PGNSP PGUID b f 1186 1083 1083    0	0 0 0 0 0 interval_pl_time - - ));
+
+DATA(insert OID = 1862 ( "="	   PGNSP PGUID b f  21  20  16 1868  1863  95 412 1864 1865 int28eq eqsel eqjoinsel ));
+DATA(insert OID = 1863 ( "<>"	   PGNSP PGUID b f  21  20  16 1869  1862   0   0   0   0 int28ne neqsel neqjoinsel ));
+DATA(insert OID = 1864 ( "<"	   PGNSP PGUID b f  21  20  16 1871  1867   0   0   0   0 int28lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1865 ( ">"	   PGNSP PGUID b f  21  20  16 1870  1866   0   0   0   0 int28gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1866 ( "<="	   PGNSP PGUID b f  21  20  16 1873  1865   0   0   0   0 int28le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1867 ( ">="	   PGNSP PGUID b f  21  20  16 1872  1864   0   0   0   0 int28ge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID = 1868 ( "="	   PGNSP PGUID b f  20  21  16  1862 1869 412 95 1870 1871 int82eq eqsel eqjoinsel ));
+DATA(insert OID = 1869 ( "<>"	   PGNSP PGUID b f  20  21  16  1863 1868   0  0   0   0 int82ne neqsel neqjoinsel ));
+DATA(insert OID = 1870 ( "<"	   PGNSP PGUID b f  20  21  16  1865 1873   0  0   0   0 int82lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1871 ( ">"	   PGNSP PGUID b f  20  21  16  1864 1872   0  0   0   0 int82gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1872 ( "<="	   PGNSP PGUID b f  20  21  16  1867 1871   0  0   0   0 int82le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1873 ( ">="	   PGNSP PGUID b f  20  21  16  1866 1870   0  0   0   0 int82ge scalargtsel scalargtjoinsel ));
+
+DATA(insert OID = 1874 ( "&"	   PGNSP PGUID b f  21  21  21  1874	  0   0  0   0   0 int2and - - ));
+DATA(insert OID = 1875 ( "|"	   PGNSP PGUID b f  21  21  21  1875	  0   0  0   0   0 int2or - - ));
+DATA(insert OID = 1876 ( "#"	   PGNSP PGUID b f  21  21  21  1876	  0   0  0   0   0 int2xor - - ));
+DATA(insert OID = 1877 ( "~"	   PGNSP PGUID l f   0  21  21	 0	  0   0  0   0   0 int2not - - ));
+DATA(insert OID = 1878 ( "<<"	   PGNSP PGUID b f  21  23  21	 0	  0   0  0   0   0 int2shl - - ));
+DATA(insert OID = 1879 ( ">>"	   PGNSP PGUID b f  21  23  21	 0	  0   0  0   0   0 int2shr - - ));
+
+DATA(insert OID = 1880 ( "&"	   PGNSP PGUID b f  23  23  23  1880	  0   0  0   0   0 int4and - - ));
+DATA(insert OID = 1881 ( "|"	   PGNSP PGUID b f  23  23  23  1881	  0   0  0   0   0 int4or - - ));
+DATA(insert OID = 1882 ( "#"	   PGNSP PGUID b f  23  23  23  1882	  0   0  0   0   0 int4xor - - ));
+DATA(insert OID = 1883 ( "~"	   PGNSP PGUID l f   0  23  23	 0	  0   0  0   0   0 int4not - - ));
+DATA(insert OID = 1884 ( "<<"	   PGNSP PGUID b f  23  23  23	 0	  0   0  0   0   0 int4shl - - ));
+DATA(insert OID = 1885 ( ">>"	   PGNSP PGUID b f  23  23  23	 0	  0   0  0   0   0 int4shr - - ));
+
+DATA(insert OID = 1886 ( "&"	   PGNSP PGUID b f  20  20  20  1886	  0   0  0   0   0 int8and - - ));
+DATA(insert OID = 1887 ( "|"	   PGNSP PGUID b f  20  20  20  1887	  0   0  0   0   0 int8or - - ));
+DATA(insert OID = 1888 ( "#"	   PGNSP PGUID b f  20  20  20  1888	  0   0  0   0   0 int8xor - - ));
+DATA(insert OID = 1889 ( "~"	   PGNSP PGUID l f   0  20  20	 0	  0   0  0   0   0 int8not - - ));
+DATA(insert OID = 1890 ( "<<"	   PGNSP PGUID b f  20  23  20	 0	  0   0  0   0   0 int8shl - - ));
+DATA(insert OID = 1891 ( ">>"	   PGNSP PGUID b f  20  23  20	 0	  0   0  0   0   0 int8shr - - ));
+
+DATA(insert OID = 1916 (  "+"	   PGNSP PGUID l f   0  20  20	0	0	0	0   0   0 int8up - - ));
+DATA(insert OID = 1917 (  "+"	   PGNSP PGUID l f   0  21  21	0	0	0	0   0   0 int2up - - ));
+DATA(insert OID = 1918 (  "+"	   PGNSP PGUID l f   0  23  23	0	0	0	0   0   0 int4up - - ));
+DATA(insert OID = 1919 (  "+"	   PGNSP PGUID l f   0  700 700	0	0	0	0   0   0 float4up - - ));
+DATA(insert OID = 1920 (  "+"	   PGNSP PGUID l f   0  701 701	0	0	0	0   0   0 float8up - - ));
+DATA(insert OID = 1921 (  "+"	   PGNSP PGUID l f   0 1700 1700	0	0	0	0   0   0 numeric_uplus - - ));
 
 /* bytea operators */
-DATA(insert OID = 1955 ( "="	   PGNSP PGUID 0 b t t 17 17	16 1955 1956 1957 1957 1957 1959 byteaeq eqsel eqjoinsel ));
-DATA(insert OID = 1956 ( "<>"	   PGNSP PGUID 0 b t f 17 17	16 1956 1955 0	  0   0   0 byteane neqsel neqjoinsel ));
-DATA(insert OID = 1957 ( "<"	   PGNSP PGUID 0 b t f 17 17	16 1959 1960 0	  0   0   0 bytealt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1958 ( "<="	   PGNSP PGUID 0 b t f 17 17	16 1960 1959 0	  0   0   0 byteale scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1959 ( ">"	   PGNSP PGUID 0 b t f 17 17	16 1957 1958 0	  0   0   0 byteagt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1960 ( ">="	   PGNSP PGUID 0 b t f 17 17	16 1958 1957 0	  0   0   0 byteage scalargtsel scalargtjoinsel ));
-DATA(insert OID = 2016 (  "~~"	   PGNSP PGUID 0 b t f 17 17	16 0	2017 0	  0   0   0 bytealike likesel likejoinsel ));
+DATA(insert OID = 1955 ( "="	   PGNSP PGUID b t 17 17	16 1955 1956 1957 1957 1957 1959 byteaeq eqsel eqjoinsel ));
+DATA(insert OID = 1956 ( "<>"	   PGNSP PGUID b f 17 17	16 1956 1955 0	  0   0   0 byteane neqsel neqjoinsel ));
+DATA(insert OID = 1957 ( "<"	   PGNSP PGUID b f 17 17	16 1959 1960 0	  0   0   0 bytealt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1958 ( "<="	   PGNSP PGUID b f 17 17	16 1960 1959 0	  0   0   0 byteale scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1959 ( ">"	   PGNSP PGUID b f 17 17	16 1957 1958 0	  0   0   0 byteagt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1960 ( ">="	   PGNSP PGUID b f 17 17	16 1958 1957 0	  0   0   0 byteage scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2016 (  "~~"	   PGNSP PGUID b f 17 17	16 0	2017 0	  0   0   0 bytealike likesel likejoinsel ));
 #define OID_BYTEA_LIKE_OP		2016
-DATA(insert OID = 2017 (  "!~~"    PGNSP PGUID 0 b t f 17 17	16 0	2016 0	  0   0   0 byteanlike nlikesel nlikejoinsel ));
-DATA(insert OID = 2018 (  "||"	   PGNSP PGUID 0 b t f 17 17	17 0	0	 0	  0   0   0 byteacat - - ));
+DATA(insert OID = 2017 (  "!~~"    PGNSP PGUID b f 17 17	16 0	2016 0	  0   0   0 byteanlike nlikesel nlikejoinsel ));
+DATA(insert OID = 2018 (  "||"	   PGNSP PGUID b f 17 17	17 0	0	 0	  0   0   0 byteacat - - ));
 
 /* timestamp operators */
-DATA(insert OID = 2060 (  "="	   PGNSP PGUID 0 b t f 1114 1114	 16 2060 2061 2062 2062 2062 2064 timestamp_eq eqsel eqjoinsel ));
-DATA(insert OID = 2061 (  "<>"	   PGNSP PGUID 0 b t f 1114 1114	 16 2061 2060 0 0 0 0 timestamp_ne neqsel neqjoinsel ));
-DATA(insert OID = 2062 (  "<"	   PGNSP PGUID 0 b t f 1114 1114	 16 2064 2065 0 0 0 0 timestamp_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 2063 (  "<="	   PGNSP PGUID 0 b t f 1114 1114	 16 2065 2064 0 0 0 0 timestamp_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 2064 (  ">"	   PGNSP PGUID 0 b t f 1114 1114	 16 2062 2063 0 0 0 0 timestamp_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 2065 (  ">="	   PGNSP PGUID 0 b t f 1114 1114	 16 2063 2062 0 0 0 0 timestamp_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 2066 (  "+"	   PGNSP PGUID 0 b t f 1114 1186 1114    0	0 0 0 0 0 timestamp_pl_span - - ));
-DATA(insert OID = 2067 (  "-"	   PGNSP PGUID 0 b t f 1114 1114 1186    0	0 0 0 0 0 timestamp_mi - - ));
-DATA(insert OID = 2068 (  "-"	   PGNSP PGUID 0 b t f 1114 1186 1114    0	0 0 0 0 0 timestamp_mi_span - - ));
+DATA(insert OID = 2060 (  "="	   PGNSP PGUID b f 1114 1114	 16 2060 2061 2062 2062 2062 2064 timestamp_eq eqsel eqjoinsel ));
+DATA(insert OID = 2061 (  "<>"	   PGNSP PGUID b f 1114 1114	 16 2061 2060 0 0 0 0 timestamp_ne neqsel neqjoinsel ));
+DATA(insert OID = 2062 (  "<"	   PGNSP PGUID b f 1114 1114	 16 2064 2065 0 0 0 0 timestamp_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2063 (  "<="	   PGNSP PGUID b f 1114 1114	 16 2065 2064 0 0 0 0 timestamp_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2064 (  ">"	   PGNSP PGUID b f 1114 1114	 16 2062 2063 0 0 0 0 timestamp_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2065 (  ">="	   PGNSP PGUID b f 1114 1114	 16 2063 2062 0 0 0 0 timestamp_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2066 (  "+"	   PGNSP PGUID b f 1114 1186 1114    0	0 0 0 0 0 timestamp_pl_span - - ));
+DATA(insert OID = 2067 (  "-"	   PGNSP PGUID b f 1114 1114 1186    0	0 0 0 0 0 timestamp_mi - - ));
+DATA(insert OID = 2068 (  "-"	   PGNSP PGUID b f 1114 1186 1114    0	0 0 0 0 0 timestamp_mi_span - - ));
 
 /* array equality operators */
-DATA(insert OID = 2222 (  "="	   PGNSP PGUID 0 b t f  2207	2207  16  2222 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2223 (  "="	   PGNSP PGUID 0 b t f  2208	2208  16  2223 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2224 (  "="	   PGNSP PGUID 0 b t f  2209	2209  16  2224 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2225 (  "="	   PGNSP PGUID 0 b t f  2210	2210  16  2225 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2226 (  "="	   PGNSP PGUID 0 b t f  2211	2211  16  2226 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-
-DATA(insert OID = 2227 (  "="	   PGNSP PGUID 0 b t f   629	 629  16  2227 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2228 (  "="	   PGNSP PGUID 0 b t f   651	 651  16  2228 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2229 (  "="	   PGNSP PGUID 0 b t f   719	 719  16  2229 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2230 (  "="	   PGNSP PGUID 0 b t f   791	 791  16  2230 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2231 (  "="	   PGNSP PGUID 0 b t f  1014	1014  16  2231 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2232 (  "="	   PGNSP PGUID 0 b t f  1015	1015  16  2232 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2233 (  "="	   PGNSP PGUID 0 b t f  1016	1016  16  2233 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2234 (  "="	   PGNSP PGUID 0 b t f  1040	1040  16  2234 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2235 (  "="	   PGNSP PGUID 0 b t f  1041	1041  16  2235 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2236 (  "="	   PGNSP PGUID 0 b t f  1115	1115  16  2236 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2237 (  "="	   PGNSP PGUID 0 b t f  1182	1182  16  2237 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2238 (  "="	   PGNSP PGUID 0 b t f  1183	1183  16  2238 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2239 (  "="	   PGNSP PGUID 0 b t f  1185	1185  16  2239 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2240 (  "="	   PGNSP PGUID 0 b t f  1187	1187  16  2240 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2241 (  "="	   PGNSP PGUID 0 b t f  1231	1231  16  2241 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2242 (  "="	   PGNSP PGUID 0 b t f  1270	1270  16  2242 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2243 (  "="	   PGNSP PGUID 0 b t f  1561	1561  16  2243 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2244 (  "="	   PGNSP PGUID 0 b t f  1563	1563  16  2244 0  0	0   0   0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 2245 (  "="	   PGNSP PGUID 0 b t f  2201	2201  16  2245 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2222 (  "="	   PGNSP PGUID b f  2207	2207  16  2222 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2223 (  "="	   PGNSP PGUID b f  2208	2208  16  2223 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2224 (  "="	   PGNSP PGUID b f  2209	2209  16  2224 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2225 (  "="	   PGNSP PGUID b f  2210	2210  16  2225 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2226 (  "="	   PGNSP PGUID b f  2211	2211  16  2226 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+
+DATA(insert OID = 2227 (  "="	   PGNSP PGUID b f   629	 629  16  2227 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2228 (  "="	   PGNSP PGUID b f   651	 651  16  2228 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2229 (  "="	   PGNSP PGUID b f   719	 719  16  2229 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2230 (  "="	   PGNSP PGUID b f   791	 791  16  2230 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2231 (  "="	   PGNSP PGUID b f  1014	1014  16  2231 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2232 (  "="	   PGNSP PGUID b f  1015	1015  16  2232 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2233 (  "="	   PGNSP PGUID b f  1016	1016  16  2233 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2234 (  "="	   PGNSP PGUID b f  1040	1040  16  2234 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2235 (  "="	   PGNSP PGUID b f  1041	1041  16  2235 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2236 (  "="	   PGNSP PGUID b f  1115	1115  16  2236 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2237 (  "="	   PGNSP PGUID b f  1182	1182  16  2237 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2238 (  "="	   PGNSP PGUID b f  1183	1183  16  2238 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2239 (  "="	   PGNSP PGUID b f  1185	1185  16  2239 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2240 (  "="	   PGNSP PGUID b f  1187	1187  16  2240 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2241 (  "="	   PGNSP PGUID b f  1231	1231  16  2241 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2242 (  "="	   PGNSP PGUID b f  1270	1270  16  2242 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2243 (  "="	   PGNSP PGUID b f  1561	1561  16  2243 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2244 (  "="	   PGNSP PGUID b f  1563	1563  16  2244 0  0	0   0   0 array_eq eqsel eqjoinsel ));
+DATA(insert OID = 2245 (  "="	   PGNSP PGUID b f  2201	2201  16  2245 0  0	0   0   0 array_eq eqsel eqjoinsel ));
 
 
 /*
@@ -883,8 +879,6 @@ extern void OperatorCreate(const char *operatorName,
 			   Oid leftTypeId,
 			   Oid rightTypeId,
 			   List *procedureName,
-			   uint16 precedence,
-			   bool isLeftAssociative,
 			   List *commutatorName,
 			   List *negatorName,
 			   List *restrictionName,
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 49667819453..c674c214ee5 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.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: pg_proc.h,v 1.245 2002/07/20 05:49:27 momjian Exp $
+ * $Id: pg_proc.h,v 1.246 2002/07/24 19:11:13 petere Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -45,17 +45,12 @@ CATALOG(pg_proc) BOOTSTRAP
 	Oid			prolang;		/* OID of pg_language entry */
 	bool		proisagg;		/* is it an aggregate? */
 	bool		prosecdef;		/* security definer */
-	bool		proimplicit;	/* unused */
 	bool		proisstrict;	/* strict with respect to NULLs? */
 	bool		proretset;		/* returns a set? */
 	char		provolatile;	/* see PROVOLATILE_ categories below */
 	int2		pronargs;		/* number of arguments */
 	Oid			prorettype;		/* OID of result type */
 	oidvector	proargtypes;	/* OIDs of argument types */
-	int4		probyte_pct;	/* currently unused */
-	int4		properbyte_cpu;	/* unused */
-	int4		propercall_cpu;	/* unused */
-	int4		prooutin_ratio;	/* unused */
 	text		prosrc;			/* VARIABLE LENGTH FIELD */
 	bytea		probin;			/* VARIABLE LENGTH FIELD */
 	aclitem		proacl[1];		/* VARIABLE LENGTH FIELD */
@@ -72,27 +67,22 @@ typedef FormData_pg_proc *Form_pg_proc;
  *		compiler constants for pg_proc
  * ----------------
  */
-#define Natts_pg_proc					20
+#define Natts_pg_proc					15
 #define Anum_pg_proc_proname			1
 #define Anum_pg_proc_pronamespace		2
 #define Anum_pg_proc_proowner			3
 #define Anum_pg_proc_prolang			4
 #define Anum_pg_proc_proisagg			5
 #define Anum_pg_proc_prosecdef			6
-#define Anum_pg_proc_proimplicit		7
-#define Anum_pg_proc_proisstrict		8
-#define Anum_pg_proc_proretset			9
-#define Anum_pg_proc_provolatile		10
-#define Anum_pg_proc_pronargs			11
-#define Anum_pg_proc_prorettype			12
-#define Anum_pg_proc_proargtypes		13
-#define Anum_pg_proc_probyte_pct		14
-#define Anum_pg_proc_properbyte_cpu		15
-#define Anum_pg_proc_propercall_cpu		16
-#define Anum_pg_proc_prooutin_ratio		17
-#define Anum_pg_proc_prosrc				18
-#define Anum_pg_proc_probin				19
-#define Anum_pg_proc_proacl				20
+#define Anum_pg_proc_proisstrict		7
+#define Anum_pg_proc_proretset			8
+#define Anum_pg_proc_provolatile		9
+#define Anum_pg_proc_pronargs			10
+#define Anum_pg_proc_prorettype			11
+#define Anum_pg_proc_proargtypes		12
+#define Anum_pg_proc_prosrc				13
+#define Anum_pg_proc_probin				14
+#define Anum_pg_proc_proacl				15
 
 /* ----------------
  *		initial contents of pg_proc
@@ -103,2885 +93,2885 @@ typedef FormData_pg_proc *Form_pg_proc;
 
 /* OIDS 1 - 99 */
 
-DATA(insert OID = 1242 (  boolin		   PGNSP PGUID 12 f f f t f i 1 16 "0" 100 0 0	100  boolin - _null_ ));
+DATA(insert OID = 1242 (  boolin		   PGNSP PGUID 12 f f t f i 1 16 "0"  boolin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1243 (  boolout		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	boolout - _null_ ));
+DATA(insert OID = 1243 (  boolout		   PGNSP PGUID 12 f f t f i 1 23 "0"	boolout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1244 (  byteain		   PGNSP PGUID 12 f f f t f i 1 17 "0" 100 0 0 100	byteain - _null_ ));
+DATA(insert OID = 1244 (  byteain		   PGNSP PGUID 12 f f t f i 1 17 "0"	byteain - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  31 (  byteaout		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	byteaout - _null_ ));
+DATA(insert OID =  31 (  byteaout		   PGNSP PGUID 12 f f t f i 1 23 "0"	byteaout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1245 (  charin		   PGNSP PGUID 12 f f f t f i 1 18 "0" 100 0 0 100	charin - _null_ ));
+DATA(insert OID = 1245 (  charin		   PGNSP PGUID 12 f f t f i 1 18 "0"	charin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  33 (  charout		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	charout - _null_ ));
+DATA(insert OID =  33 (  charout		   PGNSP PGUID 12 f f t f i 1 23 "0"	charout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  34 (  namein			   PGNSP PGUID 12 f f f t f i 1 19 "0" 100 0 0 100	namein - _null_ ));
+DATA(insert OID =  34 (  namein			   PGNSP PGUID 12 f f t f i 1 19 "0"	namein - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  35 (  nameout		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	nameout - _null_ ));
+DATA(insert OID =  35 (  nameout		   PGNSP PGUID 12 f f t f i 1 23 "0"	nameout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  38 (  int2in			   PGNSP PGUID 12 f f f t f i 1 21 "0" 100 0 0 100	int2in - _null_ ));
+DATA(insert OID =  38 (  int2in			   PGNSP PGUID 12 f f t f i 1 21 "0"	int2in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  39 (  int2out		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	int2out - _null_ ));
+DATA(insert OID =  39 (  int2out		   PGNSP PGUID 12 f f t f i 1 23 "0"	int2out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  40 (  int2vectorin	   PGNSP PGUID 12 f f f t f i 1 22 "0" 100 0 0 100	int2vectorin - _null_ ));
+DATA(insert OID =  40 (  int2vectorin	   PGNSP PGUID 12 f f t f i 1 22 "0"	int2vectorin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  41 (  int2vectorout	   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	int2vectorout - _null_ ));
+DATA(insert OID =  41 (  int2vectorout	   PGNSP PGUID 12 f f t f i 1 23 "0"	int2vectorout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  42 (  int4in			   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	int4in - _null_ ));
+DATA(insert OID =  42 (  int4in			   PGNSP PGUID 12 f f t f i 1 23 "0"	int4in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  43 (  int4out		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	int4out - _null_ ));
+DATA(insert OID =  43 (  int4out		   PGNSP PGUID 12 f f t f i 1 23 "0"	int4out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  44 (  regprocin		   PGNSP PGUID 12 f f f t f s 1 24 "0" 100 0 0 100	regprocin - _null_ ));
+DATA(insert OID =  44 (  regprocin		   PGNSP PGUID 12 f f t f s 1 24 "0"	regprocin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  45 (  regprocout		   PGNSP PGUID 12 f f f t f s 1 23 "0" 100 0 0 100	regprocout - _null_ ));
+DATA(insert OID =  45 (  regprocout		   PGNSP PGUID 12 f f t f s 1 23 "0"	regprocout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  46 (  textin			   PGNSP PGUID 12 f f f t f i 1 25 "0" 100 0 0 100	textin - _null_ ));
+DATA(insert OID =  46 (  textin			   PGNSP PGUID 12 f f t f i 1 25 "0"	textin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  47 (  textout		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	textout - _null_ ));
+DATA(insert OID =  47 (  textout		   PGNSP PGUID 12 f f t f i 1 23 "0"	textout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  48 (  tidin			   PGNSP PGUID 12 f f f t f i 1 27 "0" 100 0 0 100	tidin - _null_ ));
+DATA(insert OID =  48 (  tidin			   PGNSP PGUID 12 f f t f i 1 27 "0"	tidin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  49 (  tidout			   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	tidout - _null_ ));
+DATA(insert OID =  49 (  tidout			   PGNSP PGUID 12 f f t f i 1 23 "0"	tidout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  50 (  xidin			   PGNSP PGUID 12 f f f t f i 1 28 "0" 100 0 0 100	xidin - _null_ ));
+DATA(insert OID =  50 (  xidin			   PGNSP PGUID 12 f f t f i 1 28 "0"	xidin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  51 (  xidout			   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	xidout - _null_ ));
+DATA(insert OID =  51 (  xidout			   PGNSP PGUID 12 f f t f i 1 23 "0"	xidout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  52 (  cidin			   PGNSP PGUID 12 f f f t f i 1 29 "0" 100 0 0 100	cidin - _null_ ));
+DATA(insert OID =  52 (  cidin			   PGNSP PGUID 12 f f t f i 1 29 "0"	cidin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  53 (  cidout			   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	cidout - _null_ ));
+DATA(insert OID =  53 (  cidout			   PGNSP PGUID 12 f f t f i 1 23 "0"	cidout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  54 (  oidvectorin	   PGNSP PGUID 12 f f f t f i 1 30 "0" 100 0 0 100	oidvectorin - _null_ ));
+DATA(insert OID =  54 (  oidvectorin	   PGNSP PGUID 12 f f t f i 1 30 "0"	oidvectorin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  55 (  oidvectorout	   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	oidvectorout - _null_ ));
+DATA(insert OID =  55 (  oidvectorout	   PGNSP PGUID 12 f f t f i 1 23 "0"	oidvectorout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  56 (  boollt			   PGNSP PGUID 12 f f f t f i 2 16 "16 16" 100 0 0 100	boollt - _null_ ));
+DATA(insert OID =  56 (  boollt			   PGNSP PGUID 12 f f t f i 2 16 "16 16"	boollt - _null_ ));
 DESCR("less-than");
-DATA(insert OID =  57 (  boolgt			   PGNSP PGUID 12 f f f t f i 2 16 "16 16" 100 0 0 100	boolgt - _null_ ));
+DATA(insert OID =  57 (  boolgt			   PGNSP PGUID 12 f f t f i 2 16 "16 16"	boolgt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID =  60 (  booleq			   PGNSP PGUID 12 f f f t f i 2 16 "16 16" 100 0 0 100	booleq - _null_ ));
+DATA(insert OID =  60 (  booleq			   PGNSP PGUID 12 f f t f i 2 16 "16 16"	booleq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  61 (  chareq			   PGNSP PGUID 12 f f f t f i 2 16 "18 18" 100 0 0 100	chareq - _null_ ));
+DATA(insert OID =  61 (  chareq			   PGNSP PGUID 12 f f t f i 2 16 "18 18"	chareq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  62 (  nameeq			   PGNSP PGUID 12 f f f t f i 2 16 "19 19" 100 0 0 100	nameeq - _null_ ));
+DATA(insert OID =  62 (  nameeq			   PGNSP PGUID 12 f f t f i 2 16 "19 19"	nameeq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  63 (  int2eq			   PGNSP PGUID 12 f f f t f i 2 16 "21 21" 100 0 0 100	int2eq - _null_ ));
+DATA(insert OID =  63 (  int2eq			   PGNSP PGUID 12 f f t f i 2 16 "21 21"	int2eq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  64 (  int2lt			   PGNSP PGUID 12 f f f t f i 2 16 "21 21" 100 0 0 100	int2lt - _null_ ));
+DATA(insert OID =  64 (  int2lt			   PGNSP PGUID 12 f f t f i 2 16 "21 21"	int2lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID =  65 (  int4eq			   PGNSP PGUID 12 f f f t f i 2 16 "23 23" 100 0 0 100	int4eq - _null_ ));
+DATA(insert OID =  65 (  int4eq			   PGNSP PGUID 12 f f t f i 2 16 "23 23"	int4eq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  66 (  int4lt			   PGNSP PGUID 12 f f f t f i 2 16 "23 23" 100 0 0 100	int4lt - _null_ ));
+DATA(insert OID =  66 (  int4lt			   PGNSP PGUID 12 f f t f i 2 16 "23 23"	int4lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID =  67 (  texteq			   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	texteq - _null_ ));
+DATA(insert OID =  67 (  texteq			   PGNSP PGUID 12 f f t f i 2 16 "25 25"	texteq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  68 (  xideq			   PGNSP PGUID 12 f f f t f i 2 16 "28 28" 100 0 0 100	xideq - _null_ ));
+DATA(insert OID =  68 (  xideq			   PGNSP PGUID 12 f f t f i 2 16 "28 28"	xideq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  69 (  cideq			   PGNSP PGUID 12 f f f t f i 2 16 "29 29" 100 0 0 100	cideq - _null_ ));
+DATA(insert OID =  69 (  cideq			   PGNSP PGUID 12 f f t f i 2 16 "29 29"	cideq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  70 (  charne			   PGNSP PGUID 12 f f f t f i 2 16 "18 18" 100 0 0 100	charne - _null_ ));
+DATA(insert OID =  70 (  charne			   PGNSP PGUID 12 f f t f i 2 16 "18 18"	charne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1246 (  charlt		   PGNSP PGUID 12 f f f t f i 2 16 "18 18" 100 0 0 100	charlt - _null_ ));
+DATA(insert OID = 1246 (  charlt		   PGNSP PGUID 12 f f t f i 2 16 "18 18"	charlt - _null_ ));
 DESCR("less-than");
-DATA(insert OID =  72 (  charle			   PGNSP PGUID 12 f f f t f i 2 16 "18 18" 100 0 0 100	charle - _null_ ));
+DATA(insert OID =  72 (  charle			   PGNSP PGUID 12 f f t f i 2 16 "18 18"	charle - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  73 (  chargt			   PGNSP PGUID 12 f f f t f i 2 16 "18 18" 100 0 0 100	chargt - _null_ ));
+DATA(insert OID =  73 (  chargt			   PGNSP PGUID 12 f f t f i 2 16 "18 18"	chargt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID =  74 (  charge			   PGNSP PGUID 12 f f f t f i 2 16 "18 18" 100 0 0 100	charge - _null_ ));
+DATA(insert OID =  74 (  charge			   PGNSP PGUID 12 f f t f i 2 16 "18 18"	charge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1248 (  charpl		   PGNSP PGUID 12 f f f t f i 2 18 "18 18" 100 0 0 100	charpl - _null_ ));
+DATA(insert OID = 1248 (  charpl		   PGNSP PGUID 12 f f t f i 2 18 "18 18"	charpl - _null_ ));
 DESCR("add");
-DATA(insert OID = 1250 (  charmi		   PGNSP PGUID 12 f f f t f i 2 18 "18 18" 100 0 0 100	charmi - _null_ ));
+DATA(insert OID = 1250 (  charmi		   PGNSP PGUID 12 f f t f i 2 18 "18 18"	charmi - _null_ ));
 DESCR("subtract");
-DATA(insert OID =  77 (  charmul		   PGNSP PGUID 12 f f f t f i 2 18 "18 18" 100 0 0 100	charmul - _null_ ));
+DATA(insert OID =  77 (  charmul		   PGNSP PGUID 12 f f t f i 2 18 "18 18"	charmul - _null_ ));
 DESCR("multiply");
-DATA(insert OID =  78 (  chardiv		   PGNSP PGUID 12 f f f t f i 2 18 "18 18" 100 0 0 100	chardiv - _null_ ));
+DATA(insert OID =  78 (  chardiv		   PGNSP PGUID 12 f f t f i 2 18 "18 18"	chardiv - _null_ ));
 DESCR("divide");
 
-DATA(insert OID =  79 (  nameregexeq	   PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100	nameregexeq - _null_ ));
+DATA(insert OID =  79 (  nameregexeq	   PGNSP PGUID 12 f f t f i 2 16 "19 25"	nameregexeq - _null_ ));
 DESCR("matches regex., case-sensitive");
-DATA(insert OID = 1252 (  nameregexne	   PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100	nameregexne - _null_ ));
+DATA(insert OID = 1252 (  nameregexne	   PGNSP PGUID 12 f f t f i 2 16 "19 25"	nameregexne - _null_ ));
 DESCR("does not match regex., case-sensitive");
-DATA(insert OID = 1254 (  textregexeq	   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	textregexeq - _null_ ));
+DATA(insert OID = 1254 (  textregexeq	   PGNSP PGUID 12 f f t f i 2 16 "25 25"	textregexeq - _null_ ));
 DESCR("matches regex., case-sensitive");
-DATA(insert OID = 1256 (  textregexne	   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	textregexne - _null_ ));
+DATA(insert OID = 1256 (  textregexne	   PGNSP PGUID 12 f f t f i 2 16 "25 25"	textregexne - _null_ ));
 DESCR("does not match regex., case-sensitive");
-DATA(insert OID = 1257 (  textlen		   PGNSP PGUID 12 f f f t f i 1 23 "25" 100 0 0 100  textlen - _null_ ));
+DATA(insert OID = 1257 (  textlen		   PGNSP PGUID 12 f f t f i 1 23 "25"  textlen - _null_ ));
 DESCR("length");
-DATA(insert OID = 1258 (  textcat		   PGNSP PGUID 12 f f f t f i 2 25 "25 25" 100 0 0 100	textcat - _null_ ));
+DATA(insert OID = 1258 (  textcat		   PGNSP PGUID 12 f f t f i 2 25 "25 25"	textcat - _null_ ));
 DESCR("concatenate");
 
-DATA(insert OID =  84 (  boolne			   PGNSP PGUID 12 f f f t f i 2 16 "16 16" 100 0 0 100	boolne - _null_ ));
+DATA(insert OID =  84 (  boolne			   PGNSP PGUID 12 f f t f i 2 16 "16 16"	boolne - _null_ ));
 DESCR("not equal");
-DATA(insert OID =  89 (  version		   PGNSP PGUID 12 f f f t f s 0 25 "" 100 0 0 100 pgsql_version - _null_ ));
+DATA(insert OID =  89 (  version		   PGNSP PGUID 12 f f t f s 0 25 "" pgsql_version - _null_ ));
 DESCR("PostgreSQL version string");
 
 /* OIDS 100 - 199 */
 
-DATA(insert OID = 100 (  int8fac		   PGNSP PGUID 12 f f f t f i 1 20 "20" 100 0 0 100  int8fac - _null_ ));
+DATA(insert OID = 100 (  int8fac		   PGNSP PGUID 12 f f t f i 1 20 "20"  int8fac - _null_ ));
 DESCR("factorial");
-DATA(insert OID = 101 (  eqsel			   PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  eqsel - _null_ ));
+DATA(insert OID = 101 (  eqsel			   PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  eqsel - _null_ ));
 DESCR("restriction selectivity of = and related operators");
-DATA(insert OID = 102 (  neqsel			   PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  neqsel - _null_ ));
+DATA(insert OID = 102 (  neqsel			   PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  neqsel - _null_ ));
 DESCR("restriction selectivity of <> and related operators");
-DATA(insert OID = 103 (  scalarltsel	   PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  scalarltsel - _null_ ));
+DATA(insert OID = 103 (  scalarltsel	   PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  scalarltsel - _null_ ));
 DESCR("restriction selectivity of < and related operators on scalar datatypes");
-DATA(insert OID = 104 (  scalargtsel	   PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  scalargtsel - _null_ ));
+DATA(insert OID = 104 (  scalargtsel	   PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  scalargtsel - _null_ ));
 DESCR("restriction selectivity of > and related operators on scalar datatypes");
-DATA(insert OID = 105 (  eqjoinsel		   PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  eqjoinsel - _null_ ));
+DATA(insert OID = 105 (  eqjoinsel		   PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  eqjoinsel - _null_ ));
 DESCR("join selectivity of = and related operators");
-DATA(insert OID = 106 (  neqjoinsel		   PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  neqjoinsel - _null_ ));
+DATA(insert OID = 106 (  neqjoinsel		   PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  neqjoinsel - _null_ ));
 DESCR("join selectivity of <> and related operators");
-DATA(insert OID = 107 (  scalarltjoinsel   PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  scalarltjoinsel - _null_ ));
+DATA(insert OID = 107 (  scalarltjoinsel   PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  scalarltjoinsel - _null_ ));
 DESCR("join selectivity of < and related operators on scalar datatypes");
-DATA(insert OID = 108 (  scalargtjoinsel   PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  scalargtjoinsel - _null_ ));
+DATA(insert OID = 108 (  scalargtjoinsel   PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  scalargtjoinsel - _null_ ));
 DESCR("join selectivity of > and related operators on scalar datatypes");
 
-DATA(insert OID =  109 (  unknownin		   PGNSP PGUID 12 f f f t f i 1 705 "0" 100 0 0 100	unknownin - _null_ ));
+DATA(insert OID =  109 (  unknownin		   PGNSP PGUID 12 f f t f i 1 705 "0"	unknownin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  110 (  unknownout	   PGNSP PGUID 12 f f f t f i 1 23  "0" 100 0 0 100	unknownout - _null_ ));
+DATA(insert OID =  110 (  unknownout	   PGNSP PGUID 12 f f t f i 1 23  "0"	unknownout - _null_ ));
 DESCR("(internal)");
 
-DATA(insert OID = 112 (  text			   PGNSP PGUID 12 f f t t f i 1  25 "23" 100 0 0 100  int4_text - _null_ ));
+DATA(insert OID = 112 (  text			   PGNSP PGUID 12 f f t f i 1  25 "23"  int4_text - _null_ ));
 DESCR("convert int4 to text");
-DATA(insert OID = 113 (  text			   PGNSP PGUID 12 f f t t f i 1  25 "21" 100 0 0 100  int2_text - _null_ ));
+DATA(insert OID = 113 (  text			   PGNSP PGUID 12 f f t f i 1  25 "21"  int2_text - _null_ ));
 DESCR("convert int2 to text");
-DATA(insert OID = 114 (  text			   PGNSP PGUID 12 f f f t f i 1  25 "26" 100 0 0 100  oid_text - _null_ ));
+DATA(insert OID = 114 (  text			   PGNSP PGUID 12 f f t f i 1  25 "26"  oid_text - _null_ ));
 DESCR("convert oid to text");
 
-DATA(insert OID = 115 (  box_above		   PGNSP PGUID 12 f f f t f i 2  16 "603 603" 100 0 0 100  box_above - _null_ ));
+DATA(insert OID = 115 (  box_above		   PGNSP PGUID 12 f f t f i 2  16 "603 603"  box_above - _null_ ));
 DESCR("is above");
-DATA(insert OID = 116 (  box_below		   PGNSP PGUID 12 f f f t f i 2  16 "603 603" 100 0 0 100  box_below - _null_ ));
+DATA(insert OID = 116 (  box_below		   PGNSP PGUID 12 f f t f i 2  16 "603 603"  box_below - _null_ ));
 DESCR("is below");
 
-DATA(insert OID = 117 (  point_in		   PGNSP PGUID 12 f f f t f i 1 600 "0" 100 0 0 100  point_in - _null_ ));
+DATA(insert OID = 117 (  point_in		   PGNSP PGUID 12 f f t f i 1 600 "0"  point_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 118 (  point_out		   PGNSP PGUID 12 f f f t f i 1 23	"600" 100 0 0 100  point_out - _null_ ));
+DATA(insert OID = 118 (  point_out		   PGNSP PGUID 12 f f t f i 1 23	"600"  point_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 119 (  lseg_in		   PGNSP PGUID 12 f f f t f i 1 601 "0" 100 0 0 100  lseg_in - _null_ ));
+DATA(insert OID = 119 (  lseg_in		   PGNSP PGUID 12 f f t f i 1 601 "0"  lseg_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 120 (  lseg_out		   PGNSP PGUID 12 f f f t f i 1 23	"0" 100 0 0 100  lseg_out - _null_ ));
+DATA(insert OID = 120 (  lseg_out		   PGNSP PGUID 12 f f t f i 1 23	"0"  lseg_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 121 (  path_in		   PGNSP PGUID 12 f f f t f i 1 602 "0" 100 0 0 100  path_in - _null_ ));
+DATA(insert OID = 121 (  path_in		   PGNSP PGUID 12 f f t f i 1 602 "0"  path_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 122 (  path_out		   PGNSP PGUID 12 f f f t f i 1 23	"0" 100 0 0 100  path_out - _null_ ));
+DATA(insert OID = 122 (  path_out		   PGNSP PGUID 12 f f t f i 1 23	"0"  path_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 123 (  box_in			   PGNSP PGUID 12 f f f t f i 1 603 "0" 100 0 0 100  box_in - _null_ ));
+DATA(insert OID = 123 (  box_in			   PGNSP PGUID 12 f f t f i 1 603 "0"  box_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 124 (  box_out		   PGNSP PGUID 12 f f f t f i 1 23	"0" 100 0 0 100  box_out - _null_ ));
+DATA(insert OID = 124 (  box_out		   PGNSP PGUID 12 f f t f i 1 23	"0"  box_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 125 (  box_overlap	   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_overlap - _null_ ));
+DATA(insert OID = 125 (  box_overlap	   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_overlap - _null_ ));
 DESCR("overlaps");
-DATA(insert OID = 126 (  box_ge			   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_ge - _null_ ));
+DATA(insert OID = 126 (  box_ge			   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_ge - _null_ ));
 DESCR("greater-than-or-equal by area");
-DATA(insert OID = 127 (  box_gt			   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_gt - _null_ ));
+DATA(insert OID = 127 (  box_gt			   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_gt - _null_ ));
 DESCR("greater-than by area");
-DATA(insert OID = 128 (  box_eq			   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_eq - _null_ ));
+DATA(insert OID = 128 (  box_eq			   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_eq - _null_ ));
 DESCR("equal by area");
-DATA(insert OID = 129 (  box_lt			   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_lt - _null_ ));
+DATA(insert OID = 129 (  box_lt			   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_lt - _null_ ));
 DESCR("less-than by area");
-DATA(insert OID = 130 (  box_le			   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_le - _null_ ));
+DATA(insert OID = 130 (  box_le			   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_le - _null_ ));
 DESCR("less-than-or-equal by area");
-DATA(insert OID = 131 (  point_above	   PGNSP PGUID 12 f f f t f i 2 16 "600 600" 100 0 0 100  point_above - _null_ ));
+DATA(insert OID = 131 (  point_above	   PGNSP PGUID 12 f f t f i 2 16 "600 600"  point_above - _null_ ));
 DESCR("is above");
-DATA(insert OID = 132 (  point_left		   PGNSP PGUID 12 f f f t f i 2 16 "600 600" 100 0 0 100  point_left - _null_ ));
+DATA(insert OID = 132 (  point_left		   PGNSP PGUID 12 f f t f i 2 16 "600 600"  point_left - _null_ ));
 DESCR("is left of");
-DATA(insert OID = 133 (  point_right	   PGNSP PGUID 12 f f f t f i 2 16 "600 600" 100 0 0 100  point_right - _null_ ));
+DATA(insert OID = 133 (  point_right	   PGNSP PGUID 12 f f t f i 2 16 "600 600"  point_right - _null_ ));
 DESCR("is right of");
-DATA(insert OID = 134 (  point_below	   PGNSP PGUID 12 f f f t f i 2 16 "600 600" 100 0 0 100  point_below - _null_ ));
+DATA(insert OID = 134 (  point_below	   PGNSP PGUID 12 f f t f i 2 16 "600 600"  point_below - _null_ ));
 DESCR("is below");
-DATA(insert OID = 135 (  point_eq		   PGNSP PGUID 12 f f f t f i 2 16 "600 600" 100 0 0 100  point_eq - _null_ ));
+DATA(insert OID = 135 (  point_eq		   PGNSP PGUID 12 f f t f i 2 16 "600 600"  point_eq - _null_ ));
 DESCR("same as");
-DATA(insert OID = 136 (  on_pb			   PGNSP PGUID 12 f f f t f i 2 16 "600 603" 100 0 0 100  on_pb - _null_ ));
+DATA(insert OID = 136 (  on_pb			   PGNSP PGUID 12 f f t f i 2 16 "600 603"  on_pb - _null_ ));
 DESCR("point is inside");
-DATA(insert OID = 137 (  on_ppath		   PGNSP PGUID 12 f f f t f i 2 16 "600 602" 100 0 0 100  on_ppath - _null_ ));
+DATA(insert OID = 137 (  on_ppath		   PGNSP PGUID 12 f f t f i 2 16 "600 602"  on_ppath - _null_ ));
 DESCR("contained in");
-DATA(insert OID = 138 (  box_center		   PGNSP PGUID 12 f f f t f i 1 600 "603" 100 0 0 100  box_center - _null_ ));
+DATA(insert OID = 138 (  box_center		   PGNSP PGUID 12 f f t f i 1 600 "603"  box_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 139 (  areasel		   PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  areasel - _null_ ));
+DATA(insert OID = 139 (  areasel		   PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  areasel - _null_ ));
 DESCR("restriction selectivity for area-comparison operators");
-DATA(insert OID = 140 (  areajoinsel	   PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  areajoinsel - _null_ ));
+DATA(insert OID = 140 (  areajoinsel	   PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  areajoinsel - _null_ ));
 DESCR("join selectivity for area-comparison operators");
-DATA(insert OID = 141 (  int4mul		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4mul - _null_ ));
+DATA(insert OID = 141 (  int4mul		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 142 (  int4fac		   PGNSP PGUID 12 f f f t f i 1 23 "23" 100 0 0 100  int4fac - _null_ ));
+DATA(insert OID = 142 (  int4fac		   PGNSP PGUID 12 f f t f i 1 23 "23"  int4fac - _null_ ));
 DESCR("factorial");
-DATA(insert OID = 144 (  int4ne			   PGNSP PGUID 12 f f f t f i 2 16 "23 23" 100 0 0 100	int4ne - _null_ ));
+DATA(insert OID = 144 (  int4ne			   PGNSP PGUID 12 f f t f i 2 16 "23 23"	int4ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 145 (  int2ne			   PGNSP PGUID 12 f f f t f i 2 16 "21 21" 100 0 0 100	int2ne - _null_ ));
+DATA(insert OID = 145 (  int2ne			   PGNSP PGUID 12 f f t f i 2 16 "21 21"	int2ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 146 (  int2gt			   PGNSP PGUID 12 f f f t f i 2 16 "21 21" 100 0 0 100	int2gt - _null_ ));
+DATA(insert OID = 146 (  int2gt			   PGNSP PGUID 12 f f t f i 2 16 "21 21"	int2gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 147 (  int4gt			   PGNSP PGUID 12 f f f t f i 2 16 "23 23" 100 0 0 100	int4gt - _null_ ));
+DATA(insert OID = 147 (  int4gt			   PGNSP PGUID 12 f f t f i 2 16 "23 23"	int4gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 148 (  int2le			   PGNSP PGUID 12 f f f t f i 2 16 "21 21" 100 0 0 100	int2le - _null_ ));
+DATA(insert OID = 148 (  int2le			   PGNSP PGUID 12 f f t f i 2 16 "21 21"	int2le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 149 (  int4le			   PGNSP PGUID 12 f f f t f i 2 16 "23 23" 100 0 0 100	int4le - _null_ ));
+DATA(insert OID = 149 (  int4le			   PGNSP PGUID 12 f f t f i 2 16 "23 23"	int4le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 150 (  int4ge			   PGNSP PGUID 12 f f f t f i 2 16 "23 23" 100 0 0 100	int4ge - _null_ ));
+DATA(insert OID = 150 (  int4ge			   PGNSP PGUID 12 f f t f i 2 16 "23 23"	int4ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 151 (  int2ge			   PGNSP PGUID 12 f f f t f i 2 16 "21 21" 100 0 0 100	int2ge - _null_ ));
+DATA(insert OID = 151 (  int2ge			   PGNSP PGUID 12 f f t f i 2 16 "21 21"	int2ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 152 (  int2mul		   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2mul - _null_ ));
+DATA(insert OID = 152 (  int2mul		   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 153 (  int2div		   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2div - _null_ ));
+DATA(insert OID = 153 (  int2div		   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 154 (  int4div		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4div - _null_ ));
+DATA(insert OID = 154 (  int4div		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 155 (  int2mod		   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2mod - _null_ ));
+DATA(insert OID = 155 (  int2mod		   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 156 (  int4mod		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4mod - _null_ ));
+DATA(insert OID = 156 (  int4mod		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 157 (  textne			   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	textne - _null_ ));
+DATA(insert OID = 157 (  textne			   PGNSP PGUID 12 f f t f i 2 16 "25 25"	textne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 158 (  int24eq		   PGNSP PGUID 12 f f f t f i 2 16 "21 23" 100 0 0 100	int24eq - _null_ ));
+DATA(insert OID = 158 (  int24eq		   PGNSP PGUID 12 f f t f i 2 16 "21 23"	int24eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 159 (  int42eq		   PGNSP PGUID 12 f f f t f i 2 16 "23 21" 100 0 0 100	int42eq - _null_ ));
+DATA(insert OID = 159 (  int42eq		   PGNSP PGUID 12 f f t f i 2 16 "23 21"	int42eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 160 (  int24lt		   PGNSP PGUID 12 f f f t f i 2 16 "21 23" 100 0 0 100	int24lt - _null_ ));
+DATA(insert OID = 160 (  int24lt		   PGNSP PGUID 12 f f t f i 2 16 "21 23"	int24lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 161 (  int42lt		   PGNSP PGUID 12 f f f t f i 2 16 "23 21" 100 0 0 100	int42lt - _null_ ));
+DATA(insert OID = 161 (  int42lt		   PGNSP PGUID 12 f f t f i 2 16 "23 21"	int42lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 162 (  int24gt		   PGNSP PGUID 12 f f f t f i 2 16 "21 23" 100 0 0 100	int24gt - _null_ ));
+DATA(insert OID = 162 (  int24gt		   PGNSP PGUID 12 f f t f i 2 16 "21 23"	int24gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 163 (  int42gt		   PGNSP PGUID 12 f f f t f i 2 16 "23 21" 100 0 0 100	int42gt - _null_ ));
+DATA(insert OID = 163 (  int42gt		   PGNSP PGUID 12 f f t f i 2 16 "23 21"	int42gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 164 (  int24ne		   PGNSP PGUID 12 f f f t f i 2 16 "21 23" 100 0 0 100	int24ne - _null_ ));
+DATA(insert OID = 164 (  int24ne		   PGNSP PGUID 12 f f t f i 2 16 "21 23"	int24ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 165 (  int42ne		   PGNSP PGUID 12 f f f t f i 2 16 "23 21" 100 0 0 100	int42ne - _null_ ));
+DATA(insert OID = 165 (  int42ne		   PGNSP PGUID 12 f f t f i 2 16 "23 21"	int42ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 166 (  int24le		   PGNSP PGUID 12 f f f t f i 2 16 "21 23" 100 0 0 100	int24le - _null_ ));
+DATA(insert OID = 166 (  int24le		   PGNSP PGUID 12 f f t f i 2 16 "21 23"	int24le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 167 (  int42le		   PGNSP PGUID 12 f f f t f i 2 16 "23 21" 100 0 0 100	int42le - _null_ ));
+DATA(insert OID = 167 (  int42le		   PGNSP PGUID 12 f f t f i 2 16 "23 21"	int42le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 168 (  int24ge		   PGNSP PGUID 12 f f f t f i 2 16 "21 23" 100 0 0 100	int24ge - _null_ ));
+DATA(insert OID = 168 (  int24ge		   PGNSP PGUID 12 f f t f i 2 16 "21 23"	int24ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 169 (  int42ge		   PGNSP PGUID 12 f f f t f i 2 16 "23 21" 100 0 0 100	int42ge - _null_ ));
+DATA(insert OID = 169 (  int42ge		   PGNSP PGUID 12 f f t f i 2 16 "23 21"	int42ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 170 (  int24mul		   PGNSP PGUID 12 f f f t f i 2 23 "21 23" 100 0 0 100	int24mul - _null_ ));
+DATA(insert OID = 170 (  int24mul		   PGNSP PGUID 12 f f t f i 2 23 "21 23"	int24mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 171 (  int42mul		   PGNSP PGUID 12 f f f t f i 2 23 "23 21" 100 0 0 100	int42mul - _null_ ));
+DATA(insert OID = 171 (  int42mul		   PGNSP PGUID 12 f f t f i 2 23 "23 21"	int42mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 172 (  int24div		   PGNSP PGUID 12 f f f t f i 2 23 "21 23" 100 0 0 100	int24div - _null_ ));
+DATA(insert OID = 172 (  int24div		   PGNSP PGUID 12 f f t f i 2 23 "21 23"	int24div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 173 (  int42div		   PGNSP PGUID 12 f f f t f i 2 23 "23 21" 100 0 0 100	int42div - _null_ ));
+DATA(insert OID = 173 (  int42div		   PGNSP PGUID 12 f f t f i 2 23 "23 21"	int42div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 174 (  int24mod		   PGNSP PGUID 12 f f f t f i 2 23 "21 23" 100 0 0 100	int24mod - _null_ ));
+DATA(insert OID = 174 (  int24mod		   PGNSP PGUID 12 f f t f i 2 23 "21 23"	int24mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 175 (  int42mod		   PGNSP PGUID 12 f f f t f i 2 23 "23 21" 100 0 0 100	int42mod - _null_ ));
+DATA(insert OID = 175 (  int42mod		   PGNSP PGUID 12 f f t f i 2 23 "23 21"	int42mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 176 (  int2pl			   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2pl - _null_ ));
+DATA(insert OID = 176 (  int2pl			   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 177 (  int4pl			   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4pl - _null_ ));
+DATA(insert OID = 177 (  int4pl			   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 178 (  int24pl		   PGNSP PGUID 12 f f f t f i 2 23 "21 23" 100 0 0 100	int24pl - _null_ ));
+DATA(insert OID = 178 (  int24pl		   PGNSP PGUID 12 f f t f i 2 23 "21 23"	int24pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 179 (  int42pl		   PGNSP PGUID 12 f f f t f i 2 23 "23 21" 100 0 0 100	int42pl - _null_ ));
+DATA(insert OID = 179 (  int42pl		   PGNSP PGUID 12 f f t f i 2 23 "23 21"	int42pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 180 (  int2mi			   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2mi - _null_ ));
+DATA(insert OID = 180 (  int2mi			   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 181 (  int4mi			   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4mi - _null_ ));
+DATA(insert OID = 181 (  int4mi			   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 182 (  int24mi		   PGNSP PGUID 12 f f f t f i 2 23 "21 23" 100 0 0 100	int24mi - _null_ ));
+DATA(insert OID = 182 (  int24mi		   PGNSP PGUID 12 f f t f i 2 23 "21 23"	int24mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 183 (  int42mi		   PGNSP PGUID 12 f f f t f i 2 23 "23 21" 100 0 0 100	int42mi - _null_ ));
+DATA(insert OID = 183 (  int42mi		   PGNSP PGUID 12 f f t f i 2 23 "23 21"	int42mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 184 (  oideq			   PGNSP PGUID 12 f f f t f i 2 16 "26 26" 100 0 0 100	oideq - _null_ ));
+DATA(insert OID = 184 (  oideq			   PGNSP PGUID 12 f f t f i 2 16 "26 26"	oideq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 185 (  oidne			   PGNSP PGUID 12 f f f t f i 2 16 "26 26" 100 0 0 100	oidne - _null_ ));
+DATA(insert OID = 185 (  oidne			   PGNSP PGUID 12 f f t f i 2 16 "26 26"	oidne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 186 (  box_same		   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_same - _null_ ));
+DATA(insert OID = 186 (  box_same		   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_same - _null_ ));
 DESCR("same as");
-DATA(insert OID = 187 (  box_contain	   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_contain - _null_ ));
+DATA(insert OID = 187 (  box_contain	   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_contain - _null_ ));
 DESCR("contains");
-DATA(insert OID = 188 (  box_left		   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_left - _null_ ));
+DATA(insert OID = 188 (  box_left		   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_left - _null_ ));
 DESCR("is left of");
-DATA(insert OID = 189 (  box_overleft	   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_overleft - _null_ ));
+DATA(insert OID = 189 (  box_overleft	   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_overleft - _null_ ));
 DESCR("overlaps, but does not extend to right of");
-DATA(insert OID = 190 (  box_overright	   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_overright - _null_ ));
+DATA(insert OID = 190 (  box_overright	   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_overright - _null_ ));
 DESCR("overlaps, but does not extend to left of");
-DATA(insert OID = 191 (  box_right		   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_right - _null_ ));
+DATA(insert OID = 191 (  box_right		   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_right - _null_ ));
 DESCR("is right of");
-DATA(insert OID = 192 (  box_contained	   PGNSP PGUID 12 f f f t f i 2 16 "603 603" 100 0 0 100  box_contained - _null_ ));
+DATA(insert OID = 192 (  box_contained	   PGNSP PGUID 12 f f t f i 2 16 "603 603"  box_contained - _null_ ));
 DESCR("contained in");
-DATA(insert OID = 193 (  rt_box_union	   PGNSP PGUID 12 f f f t f i 2 603 "603 603" 100 0 0 100  rt_box_union - _null_ ));
+DATA(insert OID = 193 (  rt_box_union	   PGNSP PGUID 12 f f t f i 2 603 "603 603"  rt_box_union - _null_ ));
 DESCR("r-tree");
-DATA(insert OID = 194 (  rt_box_inter	   PGNSP PGUID 12 f f f t f i 2 603 "603 603" 100 0 0 100  rt_box_inter - _null_ ));
+DATA(insert OID = 194 (  rt_box_inter	   PGNSP PGUID 12 f f t f i 2 603 "603 603"  rt_box_inter - _null_ ));
 DESCR("r-tree");
-DATA(insert OID = 195 (  rt_box_size	   PGNSP PGUID 12 f f f t f i 2 700 "603 700" 100 0 0 100  rt_box_size - _null_ ));
+DATA(insert OID = 195 (  rt_box_size	   PGNSP PGUID 12 f f t f i 2 700 "603 700"  rt_box_size - _null_ ));
 DESCR("r-tree");
-DATA(insert OID = 196 (  rt_bigbox_size    PGNSP PGUID 12 f f f t f i 2 700 "603 700" 100 0 0 100  rt_bigbox_size - _null_ ));
+DATA(insert OID = 196 (  rt_bigbox_size    PGNSP PGUID 12 f f t f i 2 700 "603 700"  rt_bigbox_size - _null_ ));
 DESCR("r-tree");
-DATA(insert OID = 197 (  rt_poly_union	   PGNSP PGUID 12 f f f t f i 2 604 "604 604" 100 0 0 100  rt_poly_union - _null_ ));
+DATA(insert OID = 197 (  rt_poly_union	   PGNSP PGUID 12 f f t f i 2 604 "604 604"  rt_poly_union - _null_ ));
 DESCR("r-tree");
-DATA(insert OID = 198 (  rt_poly_inter	   PGNSP PGUID 12 f f f t f i 2 604 "604 604" 100 0 0 100  rt_poly_inter - _null_ ));
+DATA(insert OID = 198 (  rt_poly_inter	   PGNSP PGUID 12 f f t f i 2 604 "604 604"  rt_poly_inter - _null_ ));
 DESCR("r-tree");
-DATA(insert OID = 199 (  rt_poly_size	   PGNSP PGUID 12 f f f t f i 2 23 "604 700" 100 0 0 100  rt_poly_size - _null_ ));
+DATA(insert OID = 199 (  rt_poly_size	   PGNSP PGUID 12 f f t f i 2 23 "604 700"  rt_poly_size - _null_ ));
 DESCR("r-tree");
 
 /* OIDS 200 - 299 */
 
-DATA(insert OID = 200 (  float4in		   PGNSP PGUID 12 f f f t f i 1 700 "0" 100 0 0 100  float4in - _null_ ));
+DATA(insert OID = 200 (  float4in		   PGNSP PGUID 12 f f t f i 1 700 "0"  float4in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 201 (  float4out		   PGNSP PGUID 12 f f f t f i 1 23	"700" 100 0 0 100  float4out - _null_ ));
+DATA(insert OID = 201 (  float4out		   PGNSP PGUID 12 f f t f i 1 23	"700"  float4out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 202 (  float4mul		   PGNSP PGUID 12 f f f t f i 2 700 "700 700" 100 0 0 100  float4mul - _null_ ));
+DATA(insert OID = 202 (  float4mul		   PGNSP PGUID 12 f f t f i 2 700 "700 700"  float4mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 203 (  float4div		   PGNSP PGUID 12 f f f t f i 2 700 "700 700" 100 0 0 100  float4div - _null_ ));
+DATA(insert OID = 203 (  float4div		   PGNSP PGUID 12 f f t f i 2 700 "700 700"  float4div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 204 (  float4pl		   PGNSP PGUID 12 f f f t f i 2 700 "700 700" 100 0 0 100  float4pl - _null_ ));
+DATA(insert OID = 204 (  float4pl		   PGNSP PGUID 12 f f t f i 2 700 "700 700"  float4pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 205 (  float4mi		   PGNSP PGUID 12 f f f t f i 2 700 "700 700" 100 0 0 100  float4mi - _null_ ));
+DATA(insert OID = 205 (  float4mi		   PGNSP PGUID 12 f f t f i 2 700 "700 700"  float4mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 206 (  float4um		   PGNSP PGUID 12 f f f t f i 1 700 "700" 100 0 0 100  float4um - _null_ ));
+DATA(insert OID = 206 (  float4um		   PGNSP PGUID 12 f f t f i 1 700 "700"  float4um - _null_ ));
 DESCR("negate");
-DATA(insert OID = 207 (  float4abs		   PGNSP PGUID 12 f f f t f i 1 700 "700" 100 0 0 100  float4abs - _null_ ));
+DATA(insert OID = 207 (  float4abs		   PGNSP PGUID 12 f f t f i 1 700 "700"  float4abs - _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 208 (  float4_accum	   PGNSP PGUID 12 f f f t f i 2 1022 "1022 700" 100 0 0 100  float4_accum - _null_ ));
+DATA(insert OID = 208 (  float4_accum	   PGNSP PGUID 12 f f t f i 2 1022 "1022 700"  float4_accum - _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 209 (  float4larger	   PGNSP PGUID 12 f f f t f i 2 700 "700 700" 100 0 0 100  float4larger - _null_ ));
+DATA(insert OID = 209 (  float4larger	   PGNSP PGUID 12 f f t f i 2 700 "700 700"  float4larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 211 (  float4smaller	   PGNSP PGUID 12 f f f t f i 2 700 "700 700" 100 0 0 100  float4smaller - _null_ ));
+DATA(insert OID = 211 (  float4smaller	   PGNSP PGUID 12 f f t f i 2 700 "700 700"  float4smaller - _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 212 (  int4um			   PGNSP PGUID 12 f f f t f i 1 23 "23" 100 0 0 100  int4um - _null_ ));
+DATA(insert OID = 212 (  int4um			   PGNSP PGUID 12 f f t f i 1 23 "23"  int4um - _null_ ));
 DESCR("negate");
-DATA(insert OID = 213 (  int2um			   PGNSP PGUID 12 f f f t f i 1 21 "21" 100 0 0 100  int2um - _null_ ));
+DATA(insert OID = 213 (  int2um			   PGNSP PGUID 12 f f t f i 1 21 "21"  int2um - _null_ ));
 DESCR("negate");
 
-DATA(insert OID = 214 (  float8in		   PGNSP PGUID 12 f f f t f i 1 701 "0" 100 0 0 100  float8in - _null_ ));
+DATA(insert OID = 214 (  float8in		   PGNSP PGUID 12 f f t f i 1 701 "0"  float8in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 215 (  float8out		   PGNSP PGUID 12 f f f t f i 1 23	"701" 100 0 0 100  float8out - _null_ ));
+DATA(insert OID = 215 (  float8out		   PGNSP PGUID 12 f f t f i 1 23	"701"  float8out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 216 (  float8mul		   PGNSP PGUID 12 f f f t f i 2 701 "701 701" 100 0 0 100  float8mul - _null_ ));
+DATA(insert OID = 216 (  float8mul		   PGNSP PGUID 12 f f t f i 2 701 "701 701"  float8mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 217 (  float8div		   PGNSP PGUID 12 f f f t f i 2 701 "701 701" 100 0 0 100  float8div - _null_ ));
+DATA(insert OID = 217 (  float8div		   PGNSP PGUID 12 f f t f i 2 701 "701 701"  float8div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 218 (  float8pl		   PGNSP PGUID 12 f f f t f i 2 701 "701 701" 100 0 0 100  float8pl - _null_ ));
+DATA(insert OID = 218 (  float8pl		   PGNSP PGUID 12 f f t f i 2 701 "701 701"  float8pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 219 (  float8mi		   PGNSP PGUID 12 f f f t f i 2 701 "701 701" 100 0 0 100  float8mi - _null_ ));
+DATA(insert OID = 219 (  float8mi		   PGNSP PGUID 12 f f t f i 2 701 "701 701"  float8mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 220 (  float8um		   PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  float8um - _null_ ));
+DATA(insert OID = 220 (  float8um		   PGNSP PGUID 12 f f t f i 1 701 "701"  float8um - _null_ ));
 DESCR("negate");
-DATA(insert OID = 221 (  float8abs		   PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  float8abs - _null_ ));
+DATA(insert OID = 221 (  float8abs		   PGNSP PGUID 12 f f t f i 1 701 "701"  float8abs - _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 222 (  float8_accum	   PGNSP PGUID 12 f f f t f i 2 1022 "1022 701" 100 0 0 100  float8_accum - _null_ ));
+DATA(insert OID = 222 (  float8_accum	   PGNSP PGUID 12 f f t f i 2 1022 "1022 701"  float8_accum - _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 223 (  float8larger	   PGNSP PGUID 12 f f f t f i 2 701 "701 701" 100 0 0 100  float8larger - _null_ ));
+DATA(insert OID = 223 (  float8larger	   PGNSP PGUID 12 f f t f i 2 701 "701 701"  float8larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 224 (  float8smaller	   PGNSP PGUID 12 f f f t f i 2 701 "701 701" 100 0 0 100  float8smaller - _null_ ));
+DATA(insert OID = 224 (  float8smaller	   PGNSP PGUID 12 f f t f i 2 701 "701 701"  float8smaller - _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 225 (  lseg_center	   PGNSP PGUID 12 f f f t f i 1 600 "601" 100 0 0 100  lseg_center - _null_ ));
+DATA(insert OID = 225 (  lseg_center	   PGNSP PGUID 12 f f t f i 1 600 "601"  lseg_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 226 (  path_center	   PGNSP PGUID 12 f f f t f i 1 600 "602" 100 0 0 100  path_center - _null_ ));
+DATA(insert OID = 226 (  path_center	   PGNSP PGUID 12 f f t f i 1 600 "602"  path_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 227 (  poly_center	   PGNSP PGUID 12 f f f t f i 1 600 "604" 100 0 0 100  poly_center - _null_ ));
+DATA(insert OID = 227 (  poly_center	   PGNSP PGUID 12 f f t f i 1 600 "604"  poly_center - _null_ ));
 DESCR("center of");
 
-DATA(insert OID = 228 (  dround			   PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dround - _null_ ));
+DATA(insert OID = 228 (  dround			   PGNSP PGUID 12 f f t f i 1 701 "701"  dround - _null_ ));
 DESCR("round to nearest integer");
-DATA(insert OID = 229 (  dtrunc			   PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dtrunc - _null_ ));
+DATA(insert OID = 229 (  dtrunc			   PGNSP PGUID 12 f f t f i 1 701 "701"  dtrunc - _null_ ));
 DESCR("truncate to integer");
-DATA(insert OID = 230 (  dsqrt			   PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dsqrt - _null_ ));
+DATA(insert OID = 230 (  dsqrt			   PGNSP PGUID 12 f f t f i 1 701 "701"  dsqrt - _null_ ));
 DESCR("square root");
-DATA(insert OID = 231 (  dcbrt			   PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dcbrt - _null_ ));
+DATA(insert OID = 231 (  dcbrt			   PGNSP PGUID 12 f f t f i 1 701 "701"  dcbrt - _null_ ));
 DESCR("cube root");
-DATA(insert OID = 232 (  dpow			   PGNSP PGUID 12 f f f t f i 2 701 "701 701" 100 0 0 100  dpow - _null_ ));
+DATA(insert OID = 232 (  dpow			   PGNSP PGUID 12 f f t f i 2 701 "701 701"  dpow - _null_ ));
 DESCR("exponentiation (x^y)");
-DATA(insert OID = 233 (  dexp			   PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dexp - _null_ ));
+DATA(insert OID = 233 (  dexp			   PGNSP PGUID 12 f f t f i 1 701 "701"  dexp - _null_ ));
 DESCR("natural exponential (e^x)");
-DATA(insert OID = 234 (  dlog1			   PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dlog1 - _null_ ));
+DATA(insert OID = 234 (  dlog1			   PGNSP PGUID 12 f f t f i 1 701 "701"  dlog1 - _null_ ));
 DESCR("natural logarithm");
-DATA(insert OID = 235 (  float8			   PGNSP PGUID 12 f f t t f i 1 701  "21" 100 0 0 100  i2tod - _null_ ));
+DATA(insert OID = 235 (  float8			   PGNSP PGUID 12 f f t f i 1 701  "21"  i2tod - _null_ ));
 DESCR("convert int2 to float8");
-DATA(insert OID = 236 (  float4			   PGNSP PGUID 12 f f t t f i 1 700  "21" 100 0 0 100  i2tof - _null_ ));
+DATA(insert OID = 236 (  float4			   PGNSP PGUID 12 f f t f i 1 700  "21"  i2tof - _null_ ));
 DESCR("convert int2 to float4");
-DATA(insert OID = 237 (  int2			   PGNSP PGUID 12 f f f t f i 1  21 "701" 100 0 0 100  dtoi2 - _null_ ));
+DATA(insert OID = 237 (  int2			   PGNSP PGUID 12 f f t f i 1  21 "701"  dtoi2 - _null_ ));
 DESCR("convert float8 to int2");
-DATA(insert OID = 238 (  int2			   PGNSP PGUID 12 f f f t f i 1  21 "700" 100 0 0 100  ftoi2 - _null_ ));
+DATA(insert OID = 238 (  int2			   PGNSP PGUID 12 f f t f i 1  21 "700"  ftoi2 - _null_ ));
 DESCR("convert float4 to int2");
-DATA(insert OID = 239 (  line_distance	   PGNSP PGUID 12 f f f t f i 2 701 "628 628" 100 0 0 100  line_distance - _null_ ));
+DATA(insert OID = 239 (  line_distance	   PGNSP PGUID 12 f f t f i 2 701 "628 628"  line_distance - _null_ ));
 DESCR("distance between");
 
-DATA(insert OID = 240 (  nabstimein		   PGNSP PGUID 12 f f f t f s 1 702 "0" 100 0 0 100  nabstimein - _null_ ));
+DATA(insert OID = 240 (  nabstimein		   PGNSP PGUID 12 f f t f s 1 702 "0"  nabstimein - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 241 (  nabstimeout	   PGNSP PGUID 12 f f f t f s 1 23	"0" 100 0 0 100  nabstimeout - _null_ ));
+DATA(insert OID = 241 (  nabstimeout	   PGNSP PGUID 12 f f t f s 1 23	"0"  nabstimeout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 242 (  reltimein		   PGNSP PGUID 12 f f f t f s 1 703 "0" 100 0 0 100  reltimein - _null_ ));
+DATA(insert OID = 242 (  reltimein		   PGNSP PGUID 12 f f t f s 1 703 "0"  reltimein - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 243 (  reltimeout		   PGNSP PGUID 12 f f f t f s 1 23	"0" 100 0 0 100  reltimeout - _null_ ));
+DATA(insert OID = 243 (  reltimeout		   PGNSP PGUID 12 f f t f s 1 23	"0"  reltimeout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 244 (  timepl			   PGNSP PGUID 12 f f f t f i 2 702 "702 703" 100 0 0 100  timepl - _null_ ));
+DATA(insert OID = 244 (  timepl			   PGNSP PGUID 12 f f t f i 2 702 "702 703"  timepl - _null_ ));
 DESCR("add");
-DATA(insert OID = 245 (  timemi			   PGNSP PGUID 12 f f f t f i 2 702 "702 703" 100 0 0 100  timemi - _null_ ));
+DATA(insert OID = 245 (  timemi			   PGNSP PGUID 12 f f t f i 2 702 "702 703"  timemi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 246 (  tintervalin	   PGNSP PGUID 12 f f f t f s 1 704 "0" 100 0 0 100  tintervalin - _null_ ));
+DATA(insert OID = 246 (  tintervalin	   PGNSP PGUID 12 f f t f s 1 704 "0"  tintervalin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 247 (  tintervalout	   PGNSP PGUID 12 f f f t f s 1 23	"0" 100 0 0 100  tintervalout - _null_ ));
+DATA(insert OID = 247 (  tintervalout	   PGNSP PGUID 12 f f t f s 1 23	"0"  tintervalout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 248 (  intinterval	   PGNSP PGUID 12 f f f t f i 2 16 "702 704" 100 0 0 100  intinterval - _null_ ));
+DATA(insert OID = 248 (  intinterval	   PGNSP PGUID 12 f f t f i 2 16 "702 704"  intinterval - _null_ ));
 DESCR("abstime in tinterval");
-DATA(insert OID = 249 (  tintervalrel	   PGNSP PGUID 12 f f f t f i 1 703 "704" 100 0 0 100  tintervalrel - _null_ ));
+DATA(insert OID = 249 (  tintervalrel	   PGNSP PGUID 12 f f t f i 1 703 "704"  tintervalrel - _null_ ));
 DESCR("");
-DATA(insert OID = 250 (  timenow		   PGNSP PGUID 12 f f f t f s 0 702 "0" 100 0 0 100  timenow - _null_ ));
+DATA(insert OID = 250 (  timenow		   PGNSP PGUID 12 f f t f s 0 702 "0"  timenow - _null_ ));
 DESCR("Current date and time (abstime)");
-DATA(insert OID = 251 (  abstimeeq		   PGNSP PGUID 12 f f f t f i 2 16 "702 702" 100 0 0 100  abstimeeq - _null_ ));
+DATA(insert OID = 251 (  abstimeeq		   PGNSP PGUID 12 f f t f i 2 16 "702 702"  abstimeeq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 252 (  abstimene		   PGNSP PGUID 12 f f f t f i 2 16 "702 702" 100 0 0 100  abstimene - _null_ ));
+DATA(insert OID = 252 (  abstimene		   PGNSP PGUID 12 f f t f i 2 16 "702 702"  abstimene - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 253 (  abstimelt		   PGNSP PGUID 12 f f f t f i 2 16 "702 702" 100 0 0 100  abstimelt - _null_ ));
+DATA(insert OID = 253 (  abstimelt		   PGNSP PGUID 12 f f t f i 2 16 "702 702"  abstimelt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 254 (  abstimegt		   PGNSP PGUID 12 f f f t f i 2 16 "702 702" 100 0 0 100  abstimegt - _null_ ));
+DATA(insert OID = 254 (  abstimegt		   PGNSP PGUID 12 f f t f i 2 16 "702 702"  abstimegt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 255 (  abstimele		   PGNSP PGUID 12 f f f t f i 2 16 "702 702" 100 0 0 100  abstimele - _null_ ));
+DATA(insert OID = 255 (  abstimele		   PGNSP PGUID 12 f f t f i 2 16 "702 702"  abstimele - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 256 (  abstimege		   PGNSP PGUID 12 f f f t f i 2 16 "702 702" 100 0 0 100  abstimege - _null_ ));
+DATA(insert OID = 256 (  abstimege		   PGNSP PGUID 12 f f t f i 2 16 "702 702"  abstimege - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 257 (  reltimeeq		   PGNSP PGUID 12 f f f t f i 2 16 "703 703" 100 0 0 100  reltimeeq - _null_ ));
+DATA(insert OID = 257 (  reltimeeq		   PGNSP PGUID 12 f f t f i 2 16 "703 703"  reltimeeq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 258 (  reltimene		   PGNSP PGUID 12 f f f t f i 2 16 "703 703" 100 0 0 100  reltimene - _null_ ));
+DATA(insert OID = 258 (  reltimene		   PGNSP PGUID 12 f f t f i 2 16 "703 703"  reltimene - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 259 (  reltimelt		   PGNSP PGUID 12 f f f t f i 2 16 "703 703" 100 0 0 100  reltimelt - _null_ ));
+DATA(insert OID = 259 (  reltimelt		   PGNSP PGUID 12 f f t f i 2 16 "703 703"  reltimelt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 260 (  reltimegt		   PGNSP PGUID 12 f f f t f i 2 16 "703 703" 100 0 0 100  reltimegt - _null_ ));
+DATA(insert OID = 260 (  reltimegt		   PGNSP PGUID 12 f f t f i 2 16 "703 703"  reltimegt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 261 (  reltimele		   PGNSP PGUID 12 f f f t f i 2 16 "703 703" 100 0 0 100  reltimele - _null_ ));
+DATA(insert OID = 261 (  reltimele		   PGNSP PGUID 12 f f t f i 2 16 "703 703"  reltimele - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 262 (  reltimege		   PGNSP PGUID 12 f f f t f i 2 16 "703 703" 100 0 0 100  reltimege - _null_ ));
+DATA(insert OID = 262 (  reltimege		   PGNSP PGUID 12 f f t f i 2 16 "703 703"  reltimege - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 263 (  tintervalsame	   PGNSP PGUID 12 f f f t f i 2 16 "704 704" 100 0 0 100  tintervalsame - _null_ ));
+DATA(insert OID = 263 (  tintervalsame	   PGNSP PGUID 12 f f t f i 2 16 "704 704"  tintervalsame - _null_ ));
 DESCR("same as");
-DATA(insert OID = 264 (  tintervalct	   PGNSP PGUID 12 f f f t f i 2 16 "704 704" 100 0 0 100  tintervalct - _null_ ));
+DATA(insert OID = 264 (  tintervalct	   PGNSP PGUID 12 f f t f i 2 16 "704 704"  tintervalct - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 265 (  tintervalov	   PGNSP PGUID 12 f f f t f i 2 16 "704 704" 100 0 0 100  tintervalov - _null_ ));
+DATA(insert OID = 265 (  tintervalov	   PGNSP PGUID 12 f f t f i 2 16 "704 704"  tintervalov - _null_ ));
 DESCR("overlaps");
-DATA(insert OID = 266 (  tintervalleneq    PGNSP PGUID 12 f f f t f i 2 16 "704 703" 100 0 0 100  tintervalleneq - _null_ ));
+DATA(insert OID = 266 (  tintervalleneq    PGNSP PGUID 12 f f t f i 2 16 "704 703"  tintervalleneq - _null_ ));
 DESCR("length equal");
-DATA(insert OID = 267 (  tintervallenne    PGNSP PGUID 12 f f f t f i 2 16 "704 703" 100 0 0 100  tintervallenne - _null_ ));
+DATA(insert OID = 267 (  tintervallenne    PGNSP PGUID 12 f f t f i 2 16 "704 703"  tintervallenne - _null_ ));
 DESCR("length not equal to");
-DATA(insert OID = 268 (  tintervallenlt    PGNSP PGUID 12 f f f t f i 2 16 "704 703" 100 0 0 100  tintervallenlt - _null_ ));
+DATA(insert OID = 268 (  tintervallenlt    PGNSP PGUID 12 f f t f i 2 16 "704 703"  tintervallenlt - _null_ ));
 DESCR("length less-than");
-DATA(insert OID = 269 (  tintervallengt    PGNSP PGUID 12 f f f t f i 2 16 "704 703" 100 0 0 100  tintervallengt - _null_ ));
+DATA(insert OID = 269 (  tintervallengt    PGNSP PGUID 12 f f t f i 2 16 "704 703"  tintervallengt - _null_ ));
 DESCR("length greater-than");
-DATA(insert OID = 270 (  tintervallenle    PGNSP PGUID 12 f f f t f i 2 16 "704 703" 100 0 0 100  tintervallenle - _null_ ));
+DATA(insert OID = 270 (  tintervallenle    PGNSP PGUID 12 f f t f i 2 16 "704 703"  tintervallenle - _null_ ));
 DESCR("length less-than-or-equal");
-DATA(insert OID = 271 (  tintervallenge    PGNSP PGUID 12 f f f t f i 2 16 "704 703" 100 0 0 100  tintervallenge - _null_ ));
+DATA(insert OID = 271 (  tintervallenge    PGNSP PGUID 12 f f t f i 2 16 "704 703"  tintervallenge - _null_ ));
 DESCR("length greater-than-or-equal");
-DATA(insert OID = 272 (  tintervalstart    PGNSP PGUID 12 f f f t f i 1 702 "704" 100 0 0 100  tintervalstart - _null_ ));
+DATA(insert OID = 272 (  tintervalstart    PGNSP PGUID 12 f f t f i 1 702 "704"  tintervalstart - _null_ ));
 DESCR("start of interval");
-DATA(insert OID = 273 (  tintervalend	   PGNSP PGUID 12 f f f t f i 1 702 "704" 100 0 0 100  tintervalend - _null_ ));
+DATA(insert OID = 273 (  tintervalend	   PGNSP PGUID 12 f f t f i 1 702 "704"  tintervalend - _null_ ));
 DESCR("");
-DATA(insert OID = 274 (  timeofday		   PGNSP PGUID 12 f f f t f v 0 25 "0" 100 0 0 100	timeofday - _null_ ));
+DATA(insert OID = 274 (  timeofday		   PGNSP PGUID 12 f f t f v 0 25 "0"	timeofday - _null_ ));
 DESCR("Current date and time - increments during transactions");
-DATA(insert OID = 275 (  isfinite		   PGNSP PGUID 12 f f f t f i 1 16 "702" 100 0 0 100  abstime_finite - _null_ ));
+DATA(insert OID = 275 (  isfinite		   PGNSP PGUID 12 f f t f i 1 16 "702"  abstime_finite - _null_ ));
 DESCR("");
 
-DATA(insert OID = 276 (  int2fac		   PGNSP PGUID 12 f f f t f i 1 23 "21" 100 0 0 100  int2fac - _null_ ));
+DATA(insert OID = 276 (  int2fac		   PGNSP PGUID 12 f f t f i 1 23 "21"  int2fac - _null_ ));
 DESCR("factorial");
 
-DATA(insert OID = 277 (  inter_sl		   PGNSP PGUID 12 f f f t f i 2 16 "601 628" 100 0 0 100  inter_sl - _null_ ));
+DATA(insert OID = 277 (  inter_sl		   PGNSP PGUID 12 f f t f i 2 16 "601 628"  inter_sl - _null_ ));
 DESCR("");
-DATA(insert OID = 278 (  inter_lb		   PGNSP PGUID 12 f f f t f i 2 16 "628 603" 100 0 0 100  inter_lb - _null_ ));
+DATA(insert OID = 278 (  inter_lb		   PGNSP PGUID 12 f f t f i 2 16 "628 603"  inter_lb - _null_ ));
 DESCR("");
 
-DATA(insert OID = 279 (  float48mul		   PGNSP PGUID 12 f f f t f i 2 701 "700 701" 100 0 0 100  float48mul - _null_ ));
+DATA(insert OID = 279 (  float48mul		   PGNSP PGUID 12 f f t f i 2 701 "700 701"  float48mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 280 (  float48div		   PGNSP PGUID 12 f f f t f i 2 701 "700 701" 100 0 0 100  float48div - _null_ ));
+DATA(insert OID = 280 (  float48div		   PGNSP PGUID 12 f f t f i 2 701 "700 701"  float48div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 281 (  float48pl		   PGNSP PGUID 12 f f f t f i 2 701 "700 701" 100 0 0 100  float48pl - _null_ ));
+DATA(insert OID = 281 (  float48pl		   PGNSP PGUID 12 f f t f i 2 701 "700 701"  float48pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 282 (  float48mi		   PGNSP PGUID 12 f f f t f i 2 701 "700 701" 100 0 0 100  float48mi - _null_ ));
+DATA(insert OID = 282 (  float48mi		   PGNSP PGUID 12 f f t f i 2 701 "700 701"  float48mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 283 (  float84mul		   PGNSP PGUID 12 f f f t f i 2 701 "701 700" 100 0 0 100  float84mul - _null_ ));
+DATA(insert OID = 283 (  float84mul		   PGNSP PGUID 12 f f t f i 2 701 "701 700"  float84mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 284 (  float84div		   PGNSP PGUID 12 f f f t f i 2 701 "701 700" 100 0 0 100  float84div - _null_ ));
+DATA(insert OID = 284 (  float84div		   PGNSP PGUID 12 f f t f i 2 701 "701 700"  float84div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 285 (  float84pl		   PGNSP PGUID 12 f f f t f i 2 701 "701 700" 100 0 0 100  float84pl - _null_ ));
+DATA(insert OID = 285 (  float84pl		   PGNSP PGUID 12 f f t f i 2 701 "701 700"  float84pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 286 (  float84mi		   PGNSP PGUID 12 f f f t f i 2 701 "701 700" 100 0 0 100  float84mi - _null_ ));
+DATA(insert OID = 286 (  float84mi		   PGNSP PGUID 12 f f t f i 2 701 "701 700"  float84mi - _null_ ));
 DESCR("subtract");
 
-DATA(insert OID = 287 (  float4eq		   PGNSP PGUID 12 f f f t f i 2 16 "700 700" 100 0 0 100  float4eq - _null_ ));
+DATA(insert OID = 287 (  float4eq		   PGNSP PGUID 12 f f t f i 2 16 "700 700"  float4eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 288 (  float4ne		   PGNSP PGUID 12 f f f t f i 2 16 "700 700" 100 0 0 100  float4ne - _null_ ));
+DATA(insert OID = 288 (  float4ne		   PGNSP PGUID 12 f f t f i 2 16 "700 700"  float4ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 289 (  float4lt		   PGNSP PGUID 12 f f f t f i 2 16 "700 700" 100 0 0 100  float4lt - _null_ ));
+DATA(insert OID = 289 (  float4lt		   PGNSP PGUID 12 f f t f i 2 16 "700 700"  float4lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 290 (  float4le		   PGNSP PGUID 12 f f f t f i 2 16 "700 700" 100 0 0 100  float4le - _null_ ));
+DATA(insert OID = 290 (  float4le		   PGNSP PGUID 12 f f t f i 2 16 "700 700"  float4le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 291 (  float4gt		   PGNSP PGUID 12 f f f t f i 2 16 "700 700" 100 0 0 100  float4gt - _null_ ));
+DATA(insert OID = 291 (  float4gt		   PGNSP PGUID 12 f f t f i 2 16 "700 700"  float4gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 292 (  float4ge		   PGNSP PGUID 12 f f f t f i 2 16 "700 700" 100 0 0 100  float4ge - _null_ ));
+DATA(insert OID = 292 (  float4ge		   PGNSP PGUID 12 f f t f i 2 16 "700 700"  float4ge - _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 293 (  float8eq		   PGNSP PGUID 12 f f f t f i 2 16 "701 701" 100 0 0 100  float8eq - _null_ ));
+DATA(insert OID = 293 (  float8eq		   PGNSP PGUID 12 f f t f i 2 16 "701 701"  float8eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 294 (  float8ne		   PGNSP PGUID 12 f f f t f i 2 16 "701 701" 100 0 0 100  float8ne - _null_ ));
+DATA(insert OID = 294 (  float8ne		   PGNSP PGUID 12 f f t f i 2 16 "701 701"  float8ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 295 (  float8lt		   PGNSP PGUID 12 f f f t f i 2 16 "701 701" 100 0 0 100  float8lt - _null_ ));
+DATA(insert OID = 295 (  float8lt		   PGNSP PGUID 12 f f t f i 2 16 "701 701"  float8lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 296 (  float8le		   PGNSP PGUID 12 f f f t f i 2 16 "701 701" 100 0 0 100  float8le - _null_ ));
+DATA(insert OID = 296 (  float8le		   PGNSP PGUID 12 f f t f i 2 16 "701 701"  float8le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 297 (  float8gt		   PGNSP PGUID 12 f f f t f i 2 16 "701 701" 100 0 0 100  float8gt - _null_ ));
+DATA(insert OID = 297 (  float8gt		   PGNSP PGUID 12 f f t f i 2 16 "701 701"  float8gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 298 (  float8ge		   PGNSP PGUID 12 f f f t f i 2 16 "701 701" 100 0 0 100  float8ge - _null_ ));
+DATA(insert OID = 298 (  float8ge		   PGNSP PGUID 12 f f t f i 2 16 "701 701"  float8ge - _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 299 (  float48eq		   PGNSP PGUID 12 f f f t f i 2 16 "700 701" 100 0 0 100  float48eq - _null_ ));
+DATA(insert OID = 299 (  float48eq		   PGNSP PGUID 12 f f t f i 2 16 "700 701"  float48eq - _null_ ));
 DESCR("equal");
 
 /* OIDS 300 - 399 */
 
-DATA(insert OID = 300 (  float48ne		   PGNSP PGUID 12 f f f t f i 2 16 "700 701" 100 0 0 100  float48ne - _null_ ));
+DATA(insert OID = 300 (  float48ne		   PGNSP PGUID 12 f f t f i 2 16 "700 701"  float48ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 301 (  float48lt		   PGNSP PGUID 12 f f f t f i 2 16 "700 701" 100 0 0 100  float48lt - _null_ ));
+DATA(insert OID = 301 (  float48lt		   PGNSP PGUID 12 f f t f i 2 16 "700 701"  float48lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 302 (  float48le		   PGNSP PGUID 12 f f f t f i 2 16 "700 701" 100 0 0 100  float48le - _null_ ));
+DATA(insert OID = 302 (  float48le		   PGNSP PGUID 12 f f t f i 2 16 "700 701"  float48le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 303 (  float48gt		   PGNSP PGUID 12 f f f t f i 2 16 "700 701" 100 0 0 100  float48gt - _null_ ));
+DATA(insert OID = 303 (  float48gt		   PGNSP PGUID 12 f f t f i 2 16 "700 701"  float48gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 304 (  float48ge		   PGNSP PGUID 12 f f f t f i 2 16 "700 701" 100 0 0 100  float48ge - _null_ ));
+DATA(insert OID = 304 (  float48ge		   PGNSP PGUID 12 f f t f i 2 16 "700 701"  float48ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 305 (  float84eq		   PGNSP PGUID 12 f f f t f i 2 16 "701 700" 100 0 0 100  float84eq - _null_ ));
+DATA(insert OID = 305 (  float84eq		   PGNSP PGUID 12 f f t f i 2 16 "701 700"  float84eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 306 (  float84ne		   PGNSP PGUID 12 f f f t f i 2 16 "701 700" 100 0 0 100  float84ne - _null_ ));
+DATA(insert OID = 306 (  float84ne		   PGNSP PGUID 12 f f t f i 2 16 "701 700"  float84ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 307 (  float84lt		   PGNSP PGUID 12 f f f t f i 2 16 "701 700" 100 0 0 100  float84lt - _null_ ));
+DATA(insert OID = 307 (  float84lt		   PGNSP PGUID 12 f f t f i 2 16 "701 700"  float84lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 308 (  float84le		   PGNSP PGUID 12 f f f t f i 2 16 "701 700" 100 0 0 100  float84le - _null_ ));
+DATA(insert OID = 308 (  float84le		   PGNSP PGUID 12 f f t f i 2 16 "701 700"  float84le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 309 (  float84gt		   PGNSP PGUID 12 f f f t f i 2 16 "701 700" 100 0 0 100  float84gt - _null_ ));
+DATA(insert OID = 309 (  float84gt		   PGNSP PGUID 12 f f t f i 2 16 "701 700"  float84gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 310 (  float84ge		   PGNSP PGUID 12 f f f t f i 2 16 "701 700" 100 0 0 100  float84ge - _null_ ));
+DATA(insert OID = 310 (  float84ge		   PGNSP PGUID 12 f f t f i 2 16 "701 700"  float84ge - _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 311 (  float8			   PGNSP PGUID 12 f f t t f i 1 701 "700" 100 0 0 100  ftod - _null_ ));
+DATA(insert OID = 311 (  float8			   PGNSP PGUID 12 f f t f i 1 701 "700"  ftod - _null_ ));
 DESCR("convert float4 to float8");
-DATA(insert OID = 312 (  float4			   PGNSP PGUID 12 f f t t f i 1 700 "701" 100 0 0 100  dtof - _null_ ));
+DATA(insert OID = 312 (  float4			   PGNSP PGUID 12 f f t f i 1 700 "701"  dtof - _null_ ));
 DESCR("convert float8 to float4");
-DATA(insert OID = 313 (  int4			   PGNSP PGUID 12 f f t t f i 1  23  "21" 100 0 0 100  i2toi4 - _null_ ));
+DATA(insert OID = 313 (  int4			   PGNSP PGUID 12 f f t f i 1  23  "21"  i2toi4 - _null_ ));
 DESCR("convert int2 to int4");
-DATA(insert OID = 314 (  int2			   PGNSP PGUID 12 f f t t f i 1  21  "23" 100 0 0 100  i4toi2 - _null_ ));
+DATA(insert OID = 314 (  int2			   PGNSP PGUID 12 f f t f i 1  21  "23"  i4toi2 - _null_ ));
 DESCR("convert int4 to int2");
-DATA(insert OID = 315 (  int2vectoreq	   PGNSP PGUID 12 f f f t f i 2  16  "22 22" 100 0 0 100  int2vectoreq - _null_ ));
+DATA(insert OID = 315 (  int2vectoreq	   PGNSP PGUID 12 f f t f i 2  16  "22 22"  int2vectoreq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 316 (  float8			   PGNSP PGUID 12 f f t t f i 1 701  "23" 100 0 0 100  i4tod - _null_ ));
+DATA(insert OID = 316 (  float8			   PGNSP PGUID 12 f f t f i 1 701  "23"  i4tod - _null_ ));
 DESCR("convert int4 to float8");
-DATA(insert OID = 317 (  int4			   PGNSP PGUID 12 f f f t f i 1  23 "701" 100 0 0 100  dtoi4 - _null_ ));
+DATA(insert OID = 317 (  int4			   PGNSP PGUID 12 f f t f i 1  23 "701"  dtoi4 - _null_ ));
 DESCR("convert float8 to int4");
-DATA(insert OID = 318 (  float4			   PGNSP PGUID 12 f f t t f i 1 700  "23" 100 0 0 100  i4tof - _null_ ));
+DATA(insert OID = 318 (  float4			   PGNSP PGUID 12 f f t f i 1 700  "23"  i4tof - _null_ ));
 DESCR("convert int4 to float4");
-DATA(insert OID = 319 (  int4			   PGNSP PGUID 12 f f f t f i 1  23 "700" 100 0 0 100  ftoi4 - _null_ ));
+DATA(insert OID = 319 (  int4			   PGNSP PGUID 12 f f t f i 1  23 "700"  ftoi4 - _null_ ));
 DESCR("convert float4 to int4");
 
-DATA(insert OID = 320 (  rtinsert		   PGNSP PGUID 12 f f f t f v 6 23 "0 0 0 0 0 0" 100 0 0 100	rtinsert - _null_ ));
+DATA(insert OID = 320 (  rtinsert		   PGNSP PGUID 12 f f t f v 6 23 "0 0 0 0 0 0"	rtinsert - _null_ ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 322 (  rtgettuple		   PGNSP PGUID 12 f f f t f v 2 23 "0 0" 100 0 0 100  rtgettuple - _null_ ));
+DATA(insert OID = 322 (  rtgettuple		   PGNSP PGUID 12 f f t f v 2 23 "0 0"  rtgettuple - _null_ ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 323 (  rtbuild		   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100	rtbuild - _null_ ));
+DATA(insert OID = 323 (  rtbuild		   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"	rtbuild - _null_ ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 324 (  rtbeginscan	   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100  rtbeginscan - _null_ ));
+DATA(insert OID = 324 (  rtbeginscan	   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"  rtbeginscan - _null_ ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 325 (  rtendscan		   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	rtendscan - _null_ ));
+DATA(insert OID = 325 (  rtendscan		   PGNSP PGUID 12 f f t f v 1 23 "0"	rtendscan - _null_ ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 326 (  rtmarkpos		   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	rtmarkpos - _null_ ));
+DATA(insert OID = 326 (  rtmarkpos		   PGNSP PGUID 12 f f t f v 1 23 "0"	rtmarkpos - _null_ ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 327 (  rtrestrpos		   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	rtrestrpos - _null_ ));
+DATA(insert OID = 327 (  rtrestrpos		   PGNSP PGUID 12 f f t f v 1 23 "0"	rtrestrpos - _null_ ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 328 (  rtrescan		   PGNSP PGUID 12 f f f t f v 2 23 "0 0" 100 0 0 100	rtrescan - _null_ ));
+DATA(insert OID = 328 (  rtrescan		   PGNSP PGUID 12 f f t f v 2 23 "0 0"	rtrescan - _null_ ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 321 (  rtbulkdelete	   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100	rtbulkdelete - _null_ ));
+DATA(insert OID = 321 (  rtbulkdelete	   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"	rtbulkdelete - _null_ ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 1265 (  rtcostestimate   PGNSP PGUID 12 f f f t f v 8 0 "0 0 0 0 0 0 0 0" 100 0 0 100  rtcostestimate - _null_ ));
+DATA(insert OID = 1265 (  rtcostestimate   PGNSP PGUID 12 f f t f v 8 0 "0 0 0 0 0 0 0 0"  rtcostestimate - _null_ ));
 DESCR("r-tree(internal)");
 
-DATA(insert OID = 330 (  btgettuple		   PGNSP PGUID 12 f f f t f v 2 23 "0 0" 100 0 0 100  btgettuple - _null_ ));
+DATA(insert OID = 330 (  btgettuple		   PGNSP PGUID 12 f f t f v 2 23 "0 0"  btgettuple - _null_ ));
 DESCR("btree(internal)");
-DATA(insert OID = 331 (  btinsert		   PGNSP PGUID 12 f f f t f v 6 23 "0 0 0 0 0 0" 100 0 0 100	btinsert - _null_ ));
+DATA(insert OID = 331 (  btinsert		   PGNSP PGUID 12 f f t f v 6 23 "0 0 0 0 0 0"	btinsert - _null_ ));
 DESCR("btree(internal)");
-DATA(insert OID = 333 (  btbeginscan	   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100  btbeginscan - _null_ ));
+DATA(insert OID = 333 (  btbeginscan	   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"  btbeginscan - _null_ ));
 DESCR("btree(internal)");
-DATA(insert OID = 334 (  btrescan		   PGNSP PGUID 12 f f f t f v 2 23 "0 0" 100 0 0 100	btrescan - _null_ ));
+DATA(insert OID = 334 (  btrescan		   PGNSP PGUID 12 f f t f v 2 23 "0 0"	btrescan - _null_ ));
 DESCR("btree(internal)");
-DATA(insert OID = 335 (  btendscan		   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	btendscan - _null_ ));
+DATA(insert OID = 335 (  btendscan		   PGNSP PGUID 12 f f t f v 1 23 "0"	btendscan - _null_ ));
 DESCR("btree(internal)");
-DATA(insert OID = 336 (  btmarkpos		   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	btmarkpos - _null_ ));
+DATA(insert OID = 336 (  btmarkpos		   PGNSP PGUID 12 f f t f v 1 23 "0"	btmarkpos - _null_ ));
 DESCR("btree(internal)");
-DATA(insert OID = 337 (  btrestrpos		   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	btrestrpos - _null_ ));
+DATA(insert OID = 337 (  btrestrpos		   PGNSP PGUID 12 f f t f v 1 23 "0"	btrestrpos - _null_ ));
 DESCR("btree(internal)");
-DATA(insert OID = 338 (  btbuild		   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100	btbuild - _null_ ));
+DATA(insert OID = 338 (  btbuild		   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"	btbuild - _null_ ));
 DESCR("btree(internal)");
-DATA(insert OID = 332 (  btbulkdelete	   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100	btbulkdelete - _null_ ));
+DATA(insert OID = 332 (  btbulkdelete	   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"	btbulkdelete - _null_ ));
 DESCR("btree(internal)");
-DATA(insert OID = 1268 (  btcostestimate   PGNSP PGUID 12 f f f t f v 8 0 "0 0 0 0 0 0 0 0" 100 0 0 100  btcostestimate - _null_ ));
+DATA(insert OID = 1268 (  btcostestimate   PGNSP PGUID 12 f f t f v 8 0 "0 0 0 0 0 0 0 0"  btcostestimate - _null_ ));
 DESCR("btree(internal)");
 
-DATA(insert OID = 339 (  poly_same		   PGNSP PGUID 12 f f f t f i 2 16 "604 604" 100 0 0 100  poly_same - _null_ ));
+DATA(insert OID = 339 (  poly_same		   PGNSP PGUID 12 f f t f i 2 16 "604 604"  poly_same - _null_ ));
 DESCR("same as");
-DATA(insert OID = 340 (  poly_contain	   PGNSP PGUID 12 f f f t f i 2 16 "604 604" 100 0 0 100  poly_contain - _null_ ));
+DATA(insert OID = 340 (  poly_contain	   PGNSP PGUID 12 f f t f i 2 16 "604 604"  poly_contain - _null_ ));
 DESCR("contains");
-DATA(insert OID = 341 (  poly_left		   PGNSP PGUID 12 f f f t f i 2 16 "604 604" 100 0 0 100  poly_left - _null_ ));
+DATA(insert OID = 341 (  poly_left		   PGNSP PGUID 12 f f t f i 2 16 "604 604"  poly_left - _null_ ));
 DESCR("is left of");
-DATA(insert OID = 342 (  poly_overleft	   PGNSP PGUID 12 f f f t f i 2 16 "604 604" 100 0 0 100  poly_overleft - _null_ ));
+DATA(insert OID = 342 (  poly_overleft	   PGNSP PGUID 12 f f t f i 2 16 "604 604"  poly_overleft - _null_ ));
 DESCR("overlaps, but does not extend to right of");
-DATA(insert OID = 343 (  poly_overright    PGNSP PGUID 12 f f f t f i 2 16 "604 604" 100 0 0 100  poly_overright - _null_ ));
+DATA(insert OID = 343 (  poly_overright    PGNSP PGUID 12 f f t f i 2 16 "604 604"  poly_overright - _null_ ));
 DESCR("overlaps, but does not extend to left of");
-DATA(insert OID = 344 (  poly_right		   PGNSP PGUID 12 f f f t f i 2 16 "604 604" 100 0 0 100  poly_right - _null_ ));
+DATA(insert OID = 344 (  poly_right		   PGNSP PGUID 12 f f t f i 2 16 "604 604"  poly_right - _null_ ));
 DESCR("is right of");
-DATA(insert OID = 345 (  poly_contained    PGNSP PGUID 12 f f f t f i 2 16 "604 604" 100 0 0 100  poly_contained - _null_ ));
+DATA(insert OID = 345 (  poly_contained    PGNSP PGUID 12 f f t f i 2 16 "604 604"  poly_contained - _null_ ));
 DESCR("contained in");
-DATA(insert OID = 346 (  poly_overlap	   PGNSP PGUID 12 f f f t f i 2 16 "604 604" 100 0 0 100  poly_overlap - _null_ ));
+DATA(insert OID = 346 (  poly_overlap	   PGNSP PGUID 12 f f t f i 2 16 "604 604"  poly_overlap - _null_ ));
 DESCR("overlaps");
-DATA(insert OID = 347 (  poly_in		   PGNSP PGUID 12 f f f t f i 1 604 "0" 100 0 0 100  poly_in - _null_ ));
+DATA(insert OID = 347 (  poly_in		   PGNSP PGUID 12 f f t f i 1 604 "0"  poly_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 348 (  poly_out		   PGNSP PGUID 12 f f f t f i 1 23	"0" 100 0 0 100  poly_out - _null_ ));
+DATA(insert OID = 348 (  poly_out		   PGNSP PGUID 12 f f t f i 1 23	"0"  poly_out - _null_ ));
 DESCR("(internal)");
 
-DATA(insert OID = 350 (  btint2cmp		   PGNSP PGUID 12 f f f t f i 2 23 "21 21" 100 0 0 100	btint2cmp - _null_ ));
+DATA(insert OID = 350 (  btint2cmp		   PGNSP PGUID 12 f f t f i 2 23 "21 21"	btint2cmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 351 (  btint4cmp		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	btint4cmp - _null_ ));
+DATA(insert OID = 351 (  btint4cmp		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	btint4cmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 842 (  btint8cmp		   PGNSP PGUID 12 f f f t f i 2 23 "20 20" 100 0 0 100	btint8cmp - _null_ ));
+DATA(insert OID = 842 (  btint8cmp		   PGNSP PGUID 12 f f t f i 2 23 "20 20"	btint8cmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 354 (  btfloat4cmp	   PGNSP PGUID 12 f f f t f i 2 23 "700 700" 100 0 0 100  btfloat4cmp - _null_ ));
+DATA(insert OID = 354 (  btfloat4cmp	   PGNSP PGUID 12 f f t f i 2 23 "700 700"  btfloat4cmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 355 (  btfloat8cmp	   PGNSP PGUID 12 f f f t f i 2 23 "701 701" 100 0 0 100  btfloat8cmp - _null_ ));
+DATA(insert OID = 355 (  btfloat8cmp	   PGNSP PGUID 12 f f t f i 2 23 "701 701"  btfloat8cmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 356 (  btoidcmp		   PGNSP PGUID 12 f f f t f i 2 23 "26 26" 100 0 0 100	btoidcmp - _null_ ));
+DATA(insert OID = 356 (  btoidcmp		   PGNSP PGUID 12 f f t f i 2 23 "26 26"	btoidcmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 404 (  btoidvectorcmp    PGNSP PGUID 12 f f f t f i 2 23 "30 30" 100 0 0 100	btoidvectorcmp - _null_ ));
+DATA(insert OID = 404 (  btoidvectorcmp    PGNSP PGUID 12 f f t f i 2 23 "30 30"	btoidvectorcmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 357 (  btabstimecmp	   PGNSP PGUID 12 f f f t f i 2 23 "702 702" 100 0 0 100  btabstimecmp - _null_ ));
+DATA(insert OID = 357 (  btabstimecmp	   PGNSP PGUID 12 f f t f i 2 23 "702 702"  btabstimecmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 358 (  btcharcmp		   PGNSP PGUID 12 f f f t f i 2 23 "18 18" 100 0 0 100	btcharcmp - _null_ ));
+DATA(insert OID = 358 (  btcharcmp		   PGNSP PGUID 12 f f t f i 2 23 "18 18"	btcharcmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 359 (  btnamecmp		   PGNSP PGUID 12 f f f t f i 2 23 "19 19" 100 0 0 100	btnamecmp - _null_ ));
+DATA(insert OID = 359 (  btnamecmp		   PGNSP PGUID 12 f f t f i 2 23 "19 19"	btnamecmp - _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 360 (  bttextcmp		   PGNSP PGUID 12 f f f t f i 2 23 "25 25" 100 0 0 100	bttextcmp - _null_ ));
+DATA(insert OID = 360 (  bttextcmp		   PGNSP PGUID 12 f f t f i 2 23 "25 25"	bttextcmp - _null_ ));
 DESCR("btree less-equal-greater");
 
-DATA(insert OID = 361 (  lseg_distance	   PGNSP PGUID 12 f f f t f i 2 701 "601 601" 100 0 0 100  lseg_distance - _null_ ));
+DATA(insert OID = 361 (  lseg_distance	   PGNSP PGUID 12 f f t f i 2 701 "601 601"  lseg_distance - _null_ ));
 DESCR("distance between");
-DATA(insert OID = 362 (  lseg_interpt	   PGNSP PGUID 12 f f f t f i 2 600 "601 601" 100 0 0 100  lseg_interpt - _null_ ));
+DATA(insert OID = 362 (  lseg_interpt	   PGNSP PGUID 12 f f t f i 2 600 "601 601"  lseg_interpt - _null_ ));
 DESCR("");
-DATA(insert OID = 363 (  dist_ps		   PGNSP PGUID 12 f f f t f i 2 701 "600 601" 100 0 0 100  dist_ps - _null_ ));
+DATA(insert OID = 363 (  dist_ps		   PGNSP PGUID 12 f f t f i 2 701 "600 601"  dist_ps - _null_ ));
 DESCR("distance between");
-DATA(insert OID = 364 (  dist_pb		   PGNSP PGUID 12 f f f t f i 2 701 "600 603" 100 0 0 100  dist_pb - _null_ ));
+DATA(insert OID = 364 (  dist_pb		   PGNSP PGUID 12 f f t f i 2 701 "600 603"  dist_pb - _null_ ));
 DESCR("distance between point and box");
-DATA(insert OID = 365 (  dist_sb		   PGNSP PGUID 12 f f f t f i 2 701 "601 603" 100 0 0 100  dist_sb - _null_ ));
+DATA(insert OID = 365 (  dist_sb		   PGNSP PGUID 12 f f t f i 2 701 "601 603"  dist_sb - _null_ ));
 DESCR("distance between segment and box");
-DATA(insert OID = 366 (  close_ps		   PGNSP PGUID 12 f f f t f i 2 600 "600 601" 100 0 0 100  close_ps - _null_ ));
+DATA(insert OID = 366 (  close_ps		   PGNSP PGUID 12 f f t f i 2 600 "600 601"  close_ps - _null_ ));
 DESCR("closest point on line segment");
-DATA(insert OID = 367 (  close_pb		   PGNSP PGUID 12 f f f t f i 2 600 "600 603" 100 0 0 100  close_pb - _null_ ));
+DATA(insert OID = 367 (  close_pb		   PGNSP PGUID 12 f f t f i 2 600 "600 603"  close_pb - _null_ ));
 DESCR("closest point on box");
-DATA(insert OID = 368 (  close_sb		   PGNSP PGUID 12 f f f t f i 2 600 "601 603" 100 0 0 100  close_sb - _null_ ));
+DATA(insert OID = 368 (  close_sb		   PGNSP PGUID 12 f f t f i 2 600 "601 603"  close_sb - _null_ ));
 DESCR("closest point to line segment on box");
-DATA(insert OID = 369 (  on_ps			   PGNSP PGUID 12 f f f t f i 2 16 "600 601" 100 0 0 100  on_ps - _null_ ));
+DATA(insert OID = 369 (  on_ps			   PGNSP PGUID 12 f f t f i 2 16 "600 601"  on_ps - _null_ ));
 DESCR("point contained in segment");
-DATA(insert OID = 370 (  path_distance	   PGNSP PGUID 12 f f f t f i 2 701 "602 602" 100 0 0 100  path_distance - _null_ ));
+DATA(insert OID = 370 (  path_distance	   PGNSP PGUID 12 f f t f i 2 701 "602 602"  path_distance - _null_ ));
 DESCR("distance between paths");
-DATA(insert OID = 371 (  dist_ppath		   PGNSP PGUID 12 f f f t f i 2 701 "600 602" 100 0 0 100  dist_ppath - _null_ ));
+DATA(insert OID = 371 (  dist_ppath		   PGNSP PGUID 12 f f t f i 2 701 "600 602"  dist_ppath - _null_ ));
 DESCR("distance between point and path");
-DATA(insert OID = 372 (  on_sb			   PGNSP PGUID 12 f f f t f i 2 16 "601 603" 100 0 0 100  on_sb - _null_ ));
+DATA(insert OID = 372 (  on_sb			   PGNSP PGUID 12 f f t f i 2 16 "601 603"  on_sb - _null_ ));
 DESCR("contained in");
-DATA(insert OID = 373 (  inter_sb		   PGNSP PGUID 12 f f f t f i 2 16 "601 603" 100 0 0 100  inter_sb - _null_ ));
+DATA(insert OID = 373 (  inter_sb		   PGNSP PGUID 12 f f t f i 2 16 "601 603"  inter_sb - _null_ ));
 DESCR("intersects?");
 
 /* OIDS 400 - 499 */
 
-DATA(insert OID =  406 (  text			   PGNSP PGUID 12 f f t t f i 1 25 "19" 100 0 0 100 name_text - _null_ ));
+DATA(insert OID =  406 (  text			   PGNSP PGUID 12 f f t f i 1 25 "19" name_text - _null_ ));
 DESCR("convert name to text");
-DATA(insert OID =  407 (  name			   PGNSP PGUID 12 f f t t f i 1 19 "25" 100 0 0 100 text_name - _null_ ));
+DATA(insert OID =  407 (  name			   PGNSP PGUID 12 f f t f i 1 19 "25" text_name - _null_ ));
 DESCR("convert text to name");
-DATA(insert OID =  408 (  bpchar		   PGNSP PGUID 12 f f t t f i 1 1042 "19" 100 0 0 100 name_bpchar - _null_ ));
+DATA(insert OID =  408 (  bpchar		   PGNSP PGUID 12 f f t f i 1 1042 "19" name_bpchar - _null_ ));
 DESCR("convert name to char()");
-DATA(insert OID =  409 (  name			   PGNSP PGUID 12 f f t t f i 1 19 "1042" 100 0 0 100  bpchar_name - _null_ ));
+DATA(insert OID =  409 (  name			   PGNSP PGUID 12 f f t f i 1 19 "1042"  bpchar_name - _null_ ));
 DESCR("convert char() to name");
 
-DATA(insert OID = 440 (  hashgettuple	   PGNSP PGUID 12 f f f t f v 2 23 "0 0" 100 0 0 100  hashgettuple - _null_ ));
+DATA(insert OID = 440 (  hashgettuple	   PGNSP PGUID 12 f f t f v 2 23 "0 0"  hashgettuple - _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 441 (  hashinsert		   PGNSP PGUID 12 f f f t f v 6 23 "0 0 0 0 0 0" 100 0 0 100	hashinsert - _null_ ));
+DATA(insert OID = 441 (  hashinsert		   PGNSP PGUID 12 f f t f v 6 23 "0 0 0 0 0 0"	hashinsert - _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 443 (  hashbeginscan	   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100  hashbeginscan - _null_ ));
+DATA(insert OID = 443 (  hashbeginscan	   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"  hashbeginscan - _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 444 (  hashrescan		   PGNSP PGUID 12 f f f t f v 2 23 "0 0" 100 0 0 100	hashrescan - _null_ ));
+DATA(insert OID = 444 (  hashrescan		   PGNSP PGUID 12 f f t f v 2 23 "0 0"	hashrescan - _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 445 (  hashendscan	   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	hashendscan - _null_ ));
+DATA(insert OID = 445 (  hashendscan	   PGNSP PGUID 12 f f t f v 1 23 "0"	hashendscan - _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 446 (  hashmarkpos	   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	hashmarkpos - _null_ ));
+DATA(insert OID = 446 (  hashmarkpos	   PGNSP PGUID 12 f f t f v 1 23 "0"	hashmarkpos - _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 447 (  hashrestrpos	   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	hashrestrpos - _null_ ));
+DATA(insert OID = 447 (  hashrestrpos	   PGNSP PGUID 12 f f t f v 1 23 "0"	hashrestrpos - _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 448 (  hashbuild		   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100	hashbuild - _null_ ));
+DATA(insert OID = 448 (  hashbuild		   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"	hashbuild - _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 442 (  hashbulkdelete    PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100	hashbulkdelete - _null_ ));
+DATA(insert OID = 442 (  hashbulkdelete    PGNSP PGUID 12 f f t f v 3 23 "0 0 0"	hashbulkdelete - _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 438 (  hashcostestimate  PGNSP PGUID 12 f f f t f v 8 0 "0 0 0 0 0 0 0 0" 100 0 0 100  hashcostestimate - _null_ ));
+DATA(insert OID = 438 (  hashcostestimate  PGNSP PGUID 12 f f t f v 8 0 "0 0 0 0 0 0 0 0"  hashcostestimate - _null_ ));
 DESCR("hash(internal)");
 
-DATA(insert OID = 449 (  hashint2		   PGNSP PGUID 12 f f f t f i 1 23 "21" 100 0 0 100  hashint2 - _null_ ));
+DATA(insert OID = 449 (  hashint2		   PGNSP PGUID 12 f f t f i 1 23 "21"  hashint2 - _null_ ));
 DESCR("hash");
-DATA(insert OID = 450 (  hashint4		   PGNSP PGUID 12 f f f t f i 1 23 "23" 100 0 0 100  hashint4 - _null_ ));
+DATA(insert OID = 450 (  hashint4		   PGNSP PGUID 12 f f t f i 1 23 "23"  hashint4 - _null_ ));
 DESCR("hash");
-DATA(insert OID = 949 (  hashint8		   PGNSP PGUID 12 f f f t f i 1 23 "20" 100 0 0 100  hashint8 - _null_ ));
+DATA(insert OID = 949 (  hashint8		   PGNSP PGUID 12 f f t f i 1 23 "20"  hashint8 - _null_ ));
 DESCR("hash");
-DATA(insert OID = 451 (  hashfloat4		   PGNSP PGUID 12 f f f t f i 1 23 "700" 100 0 0 100  hashfloat4 - _null_ ));
+DATA(insert OID = 451 (  hashfloat4		   PGNSP PGUID 12 f f t f i 1 23 "700"  hashfloat4 - _null_ ));
 DESCR("hash");
-DATA(insert OID = 452 (  hashfloat8		   PGNSP PGUID 12 f f f t f i 1 23 "701" 100 0 0 100  hashfloat8 - _null_ ));
+DATA(insert OID = 452 (  hashfloat8		   PGNSP PGUID 12 f f t f i 1 23 "701"  hashfloat8 - _null_ ));
 DESCR("hash");
-DATA(insert OID = 453 (  hashoid		   PGNSP PGUID 12 f f f t f i 1 23 "26" 100 0 0 100  hashoid - _null_ ));
+DATA(insert OID = 453 (  hashoid		   PGNSP PGUID 12 f f t f i 1 23 "26"  hashoid - _null_ ));
 DESCR("hash");
-DATA(insert OID = 454 (  hashchar		   PGNSP PGUID 12 f f f t f i 1 23 "18" 100 0 0 100  hashchar - _null_ ));
+DATA(insert OID = 454 (  hashchar		   PGNSP PGUID 12 f f t f i 1 23 "18"  hashchar - _null_ ));
 DESCR("hash");
-DATA(insert OID = 455 (  hashname		   PGNSP PGUID 12 f f f t f i 1 23 "19" 100 0 0 100  hashname - _null_ ));
+DATA(insert OID = 455 (  hashname		   PGNSP PGUID 12 f f t f i 1 23 "19"  hashname - _null_ ));
 DESCR("hash");
-DATA(insert OID = 456 (  hashvarlena	   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	hashvarlena - _null_ ));
+DATA(insert OID = 456 (  hashvarlena	   PGNSP PGUID 12 f f t f i 1 23 "0"	hashvarlena - _null_ ));
 DESCR("hash any varlena type");
-DATA(insert OID = 457 (  hashoidvector	   PGNSP PGUID 12 f f f t f i 1 23 "30" 100 0 0 100  hashoidvector - _null_ ));
+DATA(insert OID = 457 (  hashoidvector	   PGNSP PGUID 12 f f t f i 1 23 "30"  hashoidvector - _null_ ));
 DESCR("hash");
-DATA(insert OID = 399 (  hashmacaddr	   PGNSP PGUID 12 f f f t f i 1 23 "829" 100 0 0 100  hashmacaddr - _null_ ));
+DATA(insert OID = 399 (  hashmacaddr	   PGNSP PGUID 12 f f t f i 1 23 "829"  hashmacaddr - _null_ ));
 DESCR("hash");
-DATA(insert OID = 458 (  text_larger	   PGNSP PGUID 12 f f f t f i 2 25 "25 25" 100 0 0 100	text_larger - _null_ ));
+DATA(insert OID = 458 (  text_larger	   PGNSP PGUID 12 f f t f i 2 25 "25 25"	text_larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 459 (  text_smaller	   PGNSP PGUID 12 f f f t f i 2 25 "25 25" 100 0 0 100	text_smaller - _null_ ));
+DATA(insert OID = 459 (  text_smaller	   PGNSP PGUID 12 f f t f i 2 25 "25 25"	text_smaller - _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 460 (  int8in			   PGNSP PGUID 12 f f f t f i 1 20 "0" 100 0 0 100	int8in - _null_ ));
+DATA(insert OID = 460 (  int8in			   PGNSP PGUID 12 f f t f i 1 20 "0"	int8in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 461 (  int8out		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	int8out - _null_ ));
+DATA(insert OID = 461 (  int8out		   PGNSP PGUID 12 f f t f i 1 23 "0"	int8out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 462 (  int8um			   PGNSP PGUID 12 f f f t f i 1 20 "20" 100 0 0 100  int8um - _null_ ));
+DATA(insert OID = 462 (  int8um			   PGNSP PGUID 12 f f t f i 1 20 "20"  int8um - _null_ ));
 DESCR("negate");
-DATA(insert OID = 463 (  int8pl			   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8pl - _null_ ));
+DATA(insert OID = 463 (  int8pl			   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 464 (  int8mi			   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8mi - _null_ ));
+DATA(insert OID = 464 (  int8mi			   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 465 (  int8mul		   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8mul - _null_ ));
+DATA(insert OID = 465 (  int8mul		   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 466 (  int8div		   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8div - _null_ ));
+DATA(insert OID = 466 (  int8div		   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 467 (  int8eq			   PGNSP PGUID 12 f f f t f i 2 16 "20 20" 100 0 0 100	int8eq - _null_ ));
+DATA(insert OID = 467 (  int8eq			   PGNSP PGUID 12 f f t f i 2 16 "20 20"	int8eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 468 (  int8ne			   PGNSP PGUID 12 f f f t f i 2 16 "20 20" 100 0 0 100	int8ne - _null_ ));
+DATA(insert OID = 468 (  int8ne			   PGNSP PGUID 12 f f t f i 2 16 "20 20"	int8ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 469 (  int8lt			   PGNSP PGUID 12 f f f t f i 2 16 "20 20" 100 0 0 100	int8lt - _null_ ));
+DATA(insert OID = 469 (  int8lt			   PGNSP PGUID 12 f f t f i 2 16 "20 20"	int8lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 470 (  int8gt			   PGNSP PGUID 12 f f f t f i 2 16 "20 20" 100 0 0 100	int8gt - _null_ ));
+DATA(insert OID = 470 (  int8gt			   PGNSP PGUID 12 f f t f i 2 16 "20 20"	int8gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 471 (  int8le			   PGNSP PGUID 12 f f f t f i 2 16 "20 20" 100 0 0 100	int8le - _null_ ));
+DATA(insert OID = 471 (  int8le			   PGNSP PGUID 12 f f t f i 2 16 "20 20"	int8le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 472 (  int8ge			   PGNSP PGUID 12 f f f t f i 2 16 "20 20" 100 0 0 100	int8ge - _null_ ));
+DATA(insert OID = 472 (  int8ge			   PGNSP PGUID 12 f f t f i 2 16 "20 20"	int8ge - _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 474 (  int84eq		   PGNSP PGUID 12 f f f t f i 2 16 "20 23" 100 0 0 100	int84eq - _null_ ));
+DATA(insert OID = 474 (  int84eq		   PGNSP PGUID 12 f f t f i 2 16 "20 23"	int84eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 475 (  int84ne		   PGNSP PGUID 12 f f f t f i 2 16 "20 23" 100 0 0 100	int84ne - _null_ ));
+DATA(insert OID = 475 (  int84ne		   PGNSP PGUID 12 f f t f i 2 16 "20 23"	int84ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 476 (  int84lt		   PGNSP PGUID 12 f f f t f i 2 16 "20 23" 100 0 0 100	int84lt - _null_ ));
+DATA(insert OID = 476 (  int84lt		   PGNSP PGUID 12 f f t f i 2 16 "20 23"	int84lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 477 (  int84gt		   PGNSP PGUID 12 f f f t f i 2 16 "20 23" 100 0 0 100	int84gt - _null_ ));
+DATA(insert OID = 477 (  int84gt		   PGNSP PGUID 12 f f t f i 2 16 "20 23"	int84gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 478 (  int84le		   PGNSP PGUID 12 f f f t f i 2 16 "20 23" 100 0 0 100	int84le - _null_ ));
+DATA(insert OID = 478 (  int84le		   PGNSP PGUID 12 f f t f i 2 16 "20 23"	int84le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 479 (  int84ge		   PGNSP PGUID 12 f f f t f i 2 16 "20 23" 100 0 0 100	int84ge - _null_ ));
+DATA(insert OID = 479 (  int84ge		   PGNSP PGUID 12 f f t f i 2 16 "20 23"	int84ge - _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 480 (  int4			   PGNSP PGUID 12 f f t t f i 1  23 "20" 100 0 0 100  int84 - _null_ ));
+DATA(insert OID = 480 (  int4			   PGNSP PGUID 12 f f t f i 1  23 "20"  int84 - _null_ ));
 DESCR("convert int8 to int4");
-DATA(insert OID = 481 (  int8			   PGNSP PGUID 12 f f t t f i 1  20 "23" 100 0 0 100  int48 - _null_ ));
+DATA(insert OID = 481 (  int8			   PGNSP PGUID 12 f f t f i 1  20 "23"  int48 - _null_ ));
 DESCR("convert int4 to int8");
-DATA(insert OID = 482 (  float8			   PGNSP PGUID 12 f f t t f i 1 701 "20" 100 0 0 100  i8tod - _null_ ));
+DATA(insert OID = 482 (  float8			   PGNSP PGUID 12 f f t f i 1 701 "20"  i8tod - _null_ ));
 DESCR("convert int8 to float8");
-DATA(insert OID = 483 (  int8			   PGNSP PGUID 12 f f f t f i 1  20 "701" 100 0 0 100  dtoi8 - _null_ ));
+DATA(insert OID = 483 (  int8			   PGNSP PGUID 12 f f t f i 1  20 "701"  dtoi8 - _null_ ));
 DESCR("convert float8 to int8");
 
-DATA(insert OID = 714 (  int2			   PGNSP PGUID 12 f f t t f i 1  21 "20" 100 0 0 100  int82 - _null_ ));
+DATA(insert OID = 714 (  int2			   PGNSP PGUID 12 f f t f i 1  21 "20"  int82 - _null_ ));
 DESCR("convert int8 to int2");
-DATA(insert OID = 754 (  int8			   PGNSP PGUID 12 f f t t f i 1  20 "21" 100 0 0 100  int28 - _null_ ));
+DATA(insert OID = 754 (  int8			   PGNSP PGUID 12 f f t f i 1  20 "21"  int28 - _null_ ));
 DESCR("convert int2 to int8");
 
 /* OIDS 500 - 599 */
 
 /* OIDS 600 - 699 */
 
-DATA(insert OID = 1285 (  int4notin		   PGNSP PGUID 12 f f f t f s 2 16 "23 25" 100 0 0 100	int4notin - _null_ ));
+DATA(insert OID = 1285 (  int4notin		   PGNSP PGUID 12 f f t f s 2 16 "23 25"	int4notin - _null_ ));
 DESCR("not in");
-DATA(insert OID = 1286 (  oidnotin		   PGNSP PGUID 12 f f f t f s 2 16 "26 25" 100 0 0 100	oidnotin - _null_ ));
+DATA(insert OID = 1286 (  oidnotin		   PGNSP PGUID 12 f f t f s 2 16 "26 25"	oidnotin - _null_ ));
 DESCR("not in");
-DATA(insert OID = 1287 (  int44in		   PGNSP PGUID 12 f f f t f i 1 22 "0" 100 0 0 100	int44in - _null_ ));
+DATA(insert OID = 1287 (  int44in		   PGNSP PGUID 12 f f t f i 1 22 "0"	int44in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 653 (  int44out		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	int44out - _null_ ));
+DATA(insert OID = 653 (  int44out		   PGNSP PGUID 12 f f t f i 1 23 "0"	int44out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 655 (  namelt			   PGNSP PGUID 12 f f f t f i 2 16 "19 19" 100 0 0 100	namelt - _null_ ));
+DATA(insert OID = 655 (  namelt			   PGNSP PGUID 12 f f t f i 2 16 "19 19"	namelt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 656 (  namele			   PGNSP PGUID 12 f f f t f i 2 16 "19 19" 100 0 0 100	namele - _null_ ));
+DATA(insert OID = 656 (  namele			   PGNSP PGUID 12 f f t f i 2 16 "19 19"	namele - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 657 (  namegt			   PGNSP PGUID 12 f f f t f i 2 16 "19 19" 100 0 0 100	namegt - _null_ ));
+DATA(insert OID = 657 (  namegt			   PGNSP PGUID 12 f f t f i 2 16 "19 19"	namegt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 658 (  namege			   PGNSP PGUID 12 f f f t f i 2 16 "19 19" 100 0 0 100	namege - _null_ ));
+DATA(insert OID = 658 (  namege			   PGNSP PGUID 12 f f t f i 2 16 "19 19"	namege - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 659 (  namene			   PGNSP PGUID 12 f f f t f i 2 16 "19 19" 100 0 0 100	namene - _null_ ));
+DATA(insert OID = 659 (  namene			   PGNSP PGUID 12 f f t f i 2 16 "19 19"	namene - _null_ ));
 DESCR("not equal");
 
-DATA(insert OID = 668 (  bpchar			   PGNSP PGUID 12 f f t t f i 2 1042 "1042 23" 100 0 0 100	bpchar - _null_ ));
+DATA(insert OID = 668 (  bpchar			   PGNSP PGUID 12 f f t f i 2 1042 "1042 23"	bpchar - _null_ ));
 DESCR("adjust char() to typmod length");
-DATA(insert OID = 669 (  varchar		   PGNSP PGUID 12 f f t t f i 2 1043 "1043 23" 100 0 0 100	varchar - _null_ ));
+DATA(insert OID = 669 (  varchar		   PGNSP PGUID 12 f f t f i 2 1043 "1043 23"	varchar - _null_ ));
 DESCR("adjust varchar() to typmod length");
 
-DATA(insert OID = 676 (  mktinterval	   PGNSP PGUID 12 f f f t f i 2 704 "702 702" 100 0 0 100 mktinterval - _null_ ));
+DATA(insert OID = 676 (  mktinterval	   PGNSP PGUID 12 f f t f i 2 704 "702 702" mktinterval - _null_ ));
 DESCR("convert to tinterval");
-DATA(insert OID = 619 (  oidvectorne	   PGNSP PGUID 12 f f f t f i 2 16 "30 30" 100 0 0 100	oidvectorne - _null_ ));
+DATA(insert OID = 619 (  oidvectorne	   PGNSP PGUID 12 f f t f i 2 16 "30 30"	oidvectorne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 677 (  oidvectorlt	   PGNSP PGUID 12 f f f t f i 2 16 "30 30" 100 0 0 100	oidvectorlt - _null_ ));
+DATA(insert OID = 677 (  oidvectorlt	   PGNSP PGUID 12 f f t f i 2 16 "30 30"	oidvectorlt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 678 (  oidvectorle	   PGNSP PGUID 12 f f f t f i 2 16 "30 30" 100 0 0 100	oidvectorle - _null_ ));
+DATA(insert OID = 678 (  oidvectorle	   PGNSP PGUID 12 f f t f i 2 16 "30 30"	oidvectorle - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 679 (  oidvectoreq	   PGNSP PGUID 12 f f f t f i 2 16 "30 30" 100 0 0 100	oidvectoreq - _null_ ));
+DATA(insert OID = 679 (  oidvectoreq	   PGNSP PGUID 12 f f t f i 2 16 "30 30"	oidvectoreq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 680 (  oidvectorge	   PGNSP PGUID 12 f f f t f i 2 16 "30 30" 100 0 0 100	oidvectorge - _null_ ));
+DATA(insert OID = 680 (  oidvectorge	   PGNSP PGUID 12 f f t f i 2 16 "30 30"	oidvectorge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 681 (  oidvectorgt	   PGNSP PGUID 12 f f f t f i 2 16 "30 30" 100 0 0 100	oidvectorgt - _null_ ));
+DATA(insert OID = 681 (  oidvectorgt	   PGNSP PGUID 12 f f t f i 2 16 "30 30"	oidvectorgt - _null_ ));
 DESCR("greater-than");
 
 /* OIDS 700 - 799 */
-DATA(insert OID = 710 (  getpgusername	   PGNSP PGUID 12 f f f t f s 0 19 "0" 100 0 0 100	current_user - _null_ ));
+DATA(insert OID = 710 (  getpgusername	   PGNSP PGUID 12 f f t f s 0 19 "0"	current_user - _null_ ));
 DESCR("deprecated -- use current_user");
-DATA(insert OID = 711 (  userfntest		   PGNSP PGUID 12 f f f t f i 1 23 "23" 100 0 0 100  userfntest - _null_ ));
+DATA(insert OID = 711 (  userfntest		   PGNSP PGUID 12 f f t f i 1 23 "23"  userfntest - _null_ ));
 DESCR("");
-DATA(insert OID = 713 (  oidrand		   PGNSP PGUID 12 f f f t f v 2 16 "26 23" 100 0 0 100	oidrand - _null_ ));
+DATA(insert OID = 713 (  oidrand		   PGNSP PGUID 12 f f t f v 2 16 "26 23"	oidrand - _null_ ));
 DESCR("random");
-DATA(insert OID = 715 (  oidsrand		   PGNSP PGUID 12 f f f t f v 1 16 "23" 100 0 0 100  oidsrand - _null_ ));
+DATA(insert OID = 715 (  oidsrand		   PGNSP PGUID 12 f f t f v 1 16 "23"  oidsrand - _null_ ));
 DESCR("seed random number generator");
-DATA(insert OID = 716 (  oidlt			   PGNSP PGUID 12 f f f t f i 2 16 "26 26" 100 0 0 100	oidlt - _null_ ));
+DATA(insert OID = 716 (  oidlt			   PGNSP PGUID 12 f f t f i 2 16 "26 26"	oidlt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 717 (  oidle			   PGNSP PGUID 12 f f f t f i 2 16 "26 26" 100 0 0 100	oidle - _null_ ));
+DATA(insert OID = 717 (  oidle			   PGNSP PGUID 12 f f t f i 2 16 "26 26"	oidle - _null_ ));
 DESCR("less-than-or-equal");
 
-DATA(insert OID = 720 (  octet_length	   PGNSP PGUID 12 f f f t f i 1 23 "17" 100 0 0 100  byteaoctetlen - _null_ ));
+DATA(insert OID = 720 (  octet_length	   PGNSP PGUID 12 f f t f i 1 23 "17"  byteaoctetlen - _null_ ));
 DESCR("octet length");
-DATA(insert OID = 721 (  get_byte		   PGNSP PGUID 12 f f f t f i 2 23 "17 23" 100 0 0 100	byteaGetByte - _null_ ));
+DATA(insert OID = 721 (  get_byte		   PGNSP PGUID 12 f f t f i 2 23 "17 23"	byteaGetByte - _null_ ));
 DESCR("");
-DATA(insert OID = 722 (  set_byte		   PGNSP PGUID 12 f f f t f i 3 17 "17 23 23" 100 0 0 100  byteaSetByte - _null_ ));
+DATA(insert OID = 722 (  set_byte		   PGNSP PGUID 12 f f t f i 3 17 "17 23 23"  byteaSetByte - _null_ ));
 DESCR("");
-DATA(insert OID = 723 (  get_bit		   PGNSP PGUID 12 f f f t f i 2 23 "17 23" 100 0 0 100	byteaGetBit - _null_ ));
+DATA(insert OID = 723 (  get_bit		   PGNSP PGUID 12 f f t f i 2 23 "17 23"	byteaGetBit - _null_ ));
 DESCR("");
-DATA(insert OID = 724 (  set_bit		   PGNSP PGUID 12 f f f t f i 3 17 "17 23 23" 100 0 0 100  byteaSetBit - _null_ ));
+DATA(insert OID = 724 (  set_bit		   PGNSP PGUID 12 f f t f i 3 17 "17 23 23"  byteaSetBit - _null_ ));
 DESCR("");
 
-DATA(insert OID = 725 (  dist_pl		   PGNSP PGUID 12 f f f t f i 2 701 "600 628" 100 0 0 100  dist_pl - _null_ ));
+DATA(insert OID = 725 (  dist_pl		   PGNSP PGUID 12 f f t f i 2 701 "600 628"  dist_pl - _null_ ));
 DESCR("distance between point and line");
-DATA(insert OID = 726 (  dist_lb		   PGNSP PGUID 12 f f f t f i 2 701 "628 603" 100 0 0 100  dist_lb - _null_ ));
+DATA(insert OID = 726 (  dist_lb		   PGNSP PGUID 12 f f t f i 2 701 "628 603"  dist_lb - _null_ ));
 DESCR("distance between line and box");
-DATA(insert OID = 727 (  dist_sl		   PGNSP PGUID 12 f f f t f i 2 701 "601 628" 100 0 0 100  dist_sl - _null_ ));
+DATA(insert OID = 727 (  dist_sl		   PGNSP PGUID 12 f f t f i 2 701 "601 628"  dist_sl - _null_ ));
 DESCR("distance between lseg and line");
-DATA(insert OID = 728 (  dist_cpoly		   PGNSP PGUID 12 f f f t f i 2 701 "718 604" 100 0 0 100  dist_cpoly - _null_ ));
+DATA(insert OID = 728 (  dist_cpoly		   PGNSP PGUID 12 f f t f i 2 701 "718 604"  dist_cpoly - _null_ ));
 DESCR("distance between");
-DATA(insert OID = 729 (  poly_distance	   PGNSP PGUID 12 f f f t f i 2 701 "604 604" 100 0 0 100  poly_distance - _null_ ));
+DATA(insert OID = 729 (  poly_distance	   PGNSP PGUID 12 f f t f i 2 701 "604 604"  poly_distance - _null_ ));
 DESCR("distance between");
 
-DATA(insert OID = 740 (  text_lt		   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	text_lt - _null_ ));
+DATA(insert OID = 740 (  text_lt		   PGNSP PGUID 12 f f t f i 2 16 "25 25"	text_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 741 (  text_le		   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	text_le - _null_ ));
+DATA(insert OID = 741 (  text_le		   PGNSP PGUID 12 f f t f i 2 16 "25 25"	text_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 742 (  text_gt		   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	text_gt - _null_ ));
+DATA(insert OID = 742 (  text_gt		   PGNSP PGUID 12 f f t f i 2 16 "25 25"	text_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 743 (  text_ge		   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	text_ge - _null_ ));
+DATA(insert OID = 743 (  text_ge		   PGNSP PGUID 12 f f t f i 2 16 "25 25"	text_ge - _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 744 (  array_eq		   PGNSP PGUID 12 f f f t f i 2 16 "0 0" 100 0 0 100 array_eq - _null_ ));
+DATA(insert OID = 744 (  array_eq		   PGNSP PGUID 12 f f t f i 2 16 "0 0" array_eq - _null_ ));
 DESCR("array equal");
 
-DATA(insert OID = 745 (  current_user	   PGNSP PGUID 12 f f f t f s 0 19 "0" 100 0 0 100	current_user - _null_ ));
+DATA(insert OID = 745 (  current_user	   PGNSP PGUID 12 f f t f s 0 19 "0"	current_user - _null_ ));
 DESCR("current user name");
-DATA(insert OID = 746 (  session_user	   PGNSP PGUID 12 f f f t f s 0 19 "0" 100 0 0 100	session_user - _null_ ));
+DATA(insert OID = 746 (  session_user	   PGNSP PGUID 12 f f t f s 0 19 "0"	session_user - _null_ ));
 DESCR("session user name");
 
-DATA(insert OID = 747 (  array_dims		   PGNSP PGUID 12 f f f t f i 1 25 "0" 100 0 0 100 array_dims - _null_ ));
+DATA(insert OID = 747 (  array_dims		   PGNSP PGUID 12 f f t f i 1 25 "0" array_dims - _null_ ));
 DESCR("array dimensions");
-DATA(insert OID = 750 (  array_in		   PGNSP PGUID 12 f f f t f i 3 23 "0 26 23" 100 0 0 100  array_in - _null_ ));
+DATA(insert OID = 750 (  array_in		   PGNSP PGUID 12 f f t f i 3 23 "0 26 23"  array_in - _null_ ));
 DESCR("array");
-DATA(insert OID = 751 (  array_out		   PGNSP PGUID 12 f f f t f i 2 23 "0 26" 100 0 0 100  array_out - _null_ ));
+DATA(insert OID = 751 (  array_out		   PGNSP PGUID 12 f f t f i 2 23 "0 26"  array_out - _null_ ));
 DESCR("array");
 
-DATA(insert OID = 760 (  smgrin			   PGNSP PGUID 12 f f f t f s 1 210 "0" 100 0 0 100  smgrin - _null_ ));
+DATA(insert OID = 760 (  smgrin			   PGNSP PGUID 12 f f t f s 1 210 "0"  smgrin - _null_ ));
 DESCR("storage manager(internal)");
-DATA(insert OID = 761 (  smgrout		   PGNSP PGUID 12 f f f t f s 1 23	"0" 100 0 0 100  smgrout - _null_ ));
+DATA(insert OID = 761 (  smgrout		   PGNSP PGUID 12 f f t f s 1 23	"0"  smgrout - _null_ ));
 DESCR("storage manager(internal)");
-DATA(insert OID = 762 (  smgreq			   PGNSP PGUID 12 f f f t f i 2 16 "210 210" 100 0 0 100  smgreq - _null_ ));
+DATA(insert OID = 762 (  smgreq			   PGNSP PGUID 12 f f t f i 2 16 "210 210"  smgreq - _null_ ));
 DESCR("storage manager");
-DATA(insert OID = 763 (  smgrne			   PGNSP PGUID 12 f f f t f i 2 16 "210 210" 100 0 0 100  smgrne - _null_ ));
+DATA(insert OID = 763 (  smgrne			   PGNSP PGUID 12 f f t f i 2 16 "210 210"  smgrne - _null_ ));
 DESCR("storage manager");
 
-DATA(insert OID = 764 (  lo_import		   PGNSP PGUID 12 f f f t f v 1 26 "25" 100 0 0 100  lo_import - _null_ ));
+DATA(insert OID = 764 (  lo_import		   PGNSP PGUID 12 f f t f v 1 26 "25"  lo_import - _null_ ));
 DESCR("large object import");
-DATA(insert OID = 765 (  lo_export		   PGNSP PGUID 12 f f f t f v 2 23 "26 25" 100 0 0 100	lo_export - _null_ ));
+DATA(insert OID = 765 (  lo_export		   PGNSP PGUID 12 f f t f v 2 23 "26 25"	lo_export - _null_ ));
 DESCR("large object export");
 
-DATA(insert OID = 766 (  int4inc		   PGNSP PGUID 12 f f f t f i 1 23 "23" 100 0 0 100  int4inc - _null_ ));
+DATA(insert OID = 766 (  int4inc		   PGNSP PGUID 12 f f t f i 1 23 "23"  int4inc - _null_ ));
 DESCR("increment");
-DATA(insert OID = 768 (  int4larger		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4larger - _null_ ));
+DATA(insert OID = 768 (  int4larger		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 769 (  int4smaller	   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4smaller - _null_ ));
+DATA(insert OID = 769 (  int4smaller	   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4smaller - _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 770 (  int2larger		   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2larger - _null_ ));
+DATA(insert OID = 770 (  int2larger		   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 771 (  int2smaller	   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2smaller - _null_ ));
+DATA(insert OID = 771 (  int2smaller	   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2smaller - _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 774 (  gistgettuple	   PGNSP PGUID 12 f f f t f v 2 23 "0 0" 100 0 0 100  gistgettuple - _null_ ));
+DATA(insert OID = 774 (  gistgettuple	   PGNSP PGUID 12 f f t f v 2 23 "0 0"  gistgettuple - _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 775 (  gistinsert		   PGNSP PGUID 12 f f f t f v 6 23 "0 0 0 0 0 0" 100 0 0 100	gistinsert - _null_ ));
+DATA(insert OID = 775 (  gistinsert		   PGNSP PGUID 12 f f t f v 6 23 "0 0 0 0 0 0"	gistinsert - _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 777 (  gistbeginscan	   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100  gistbeginscan - _null_ ));
+DATA(insert OID = 777 (  gistbeginscan	   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"  gistbeginscan - _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 778 (  gistrescan		   PGNSP PGUID 12 f f f t f v 2 23 "0 0" 100 0 0 100	gistrescan - _null_ ));
+DATA(insert OID = 778 (  gistrescan		   PGNSP PGUID 12 f f t f v 2 23 "0 0"	gistrescan - _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 779 (  gistendscan	   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	gistendscan - _null_ ));
+DATA(insert OID = 779 (  gistendscan	   PGNSP PGUID 12 f f t f v 1 23 "0"	gistendscan - _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 780 (  gistmarkpos	   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	gistmarkpos - _null_ ));
+DATA(insert OID = 780 (  gistmarkpos	   PGNSP PGUID 12 f f t f v 1 23 "0"	gistmarkpos - _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 781 (  gistrestrpos	   PGNSP PGUID 12 f f f t f v 1 23 "0" 100 0 0 100	gistrestrpos - _null_ ));
+DATA(insert OID = 781 (  gistrestrpos	   PGNSP PGUID 12 f f t f v 1 23 "0"	gistrestrpos - _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 782 (  gistbuild		   PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100	gistbuild - _null_ ));
+DATA(insert OID = 782 (  gistbuild		   PGNSP PGUID 12 f f t f v 3 23 "0 0 0"	gistbuild - _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 776 (  gistbulkdelete    PGNSP PGUID 12 f f f t f v 3 23 "0 0 0" 100 0 0 100	gistbulkdelete - _null_ ));
+DATA(insert OID = 776 (  gistbulkdelete    PGNSP PGUID 12 f f t f v 3 23 "0 0 0"	gistbulkdelete - _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 772 (  gistcostestimate  PGNSP PGUID 12 f f f t f v 8 0 "0 0 0 0 0 0 0 0" 100 0 0 100  gistcostestimate - _null_ ));
+DATA(insert OID = 772 (  gistcostestimate  PGNSP PGUID 12 f f t f v 8 0 "0 0 0 0 0 0 0 0"  gistcostestimate - _null_ ));
 DESCR("gist(internal)");
 
-DATA(insert OID = 784 (  tintervaleq	   PGNSP PGUID 12 f f f t f i 2 16 "704 704" 100 0 0 100  tintervaleq - _null_ ));
+DATA(insert OID = 784 (  tintervaleq	   PGNSP PGUID 12 f f t f i 2 16 "704 704"  tintervaleq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 785 (  tintervalne	   PGNSP PGUID 12 f f f t f i 2 16 "704 704" 100 0 0 100  tintervalne - _null_ ));
+DATA(insert OID = 785 (  tintervalne	   PGNSP PGUID 12 f f t f i 2 16 "704 704"  tintervalne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 786 (  tintervallt	   PGNSP PGUID 12 f f f t f i 2 16 "704 704" 100 0 0 100  tintervallt - _null_ ));
+DATA(insert OID = 786 (  tintervallt	   PGNSP PGUID 12 f f t f i 2 16 "704 704"  tintervallt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 787 (  tintervalgt	   PGNSP PGUID 12 f f f t f i 2 16 "704 704" 100 0 0 100  tintervalgt - _null_ ));
+DATA(insert OID = 787 (  tintervalgt	   PGNSP PGUID 12 f f t f i 2 16 "704 704"  tintervalgt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 788 (  tintervalle	   PGNSP PGUID 12 f f f t f i 2 16 "704 704" 100 0 0 100  tintervalle - _null_ ));
+DATA(insert OID = 788 (  tintervalle	   PGNSP PGUID 12 f f t f i 2 16 "704 704"  tintervalle - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 789 (  tintervalge	   PGNSP PGUID 12 f f f t f i 2 16 "704 704" 100 0 0 100  tintervalge - _null_ ));
+DATA(insert OID = 789 (  tintervalge	   PGNSP PGUID 12 f f t f i 2 16 "704 704"  tintervalge - _null_ ));
 DESCR("greater-than-or-equal");
 
 /* OIDS 800 - 899 */
 
-DATA(insert OID = 817 (  oid			   PGNSP PGUID 12 f f f t f i 1 26 "25" 100 0 0 100  text_oid - _null_ ));
+DATA(insert OID = 817 (  oid			   PGNSP PGUID 12 f f t f i 1 26 "25"  text_oid - _null_ ));
 DESCR("convert text to oid");
-DATA(insert OID = 818 (  int2			   PGNSP PGUID 12 f f f t f i 1 21 "25" 100 0 0 100  text_int2 - _null_ ));
+DATA(insert OID = 818 (  int2			   PGNSP PGUID 12 f f t f i 1 21 "25"  text_int2 - _null_ ));
 DESCR("convert text to int2");
-DATA(insert OID = 819 (  int4			   PGNSP PGUID 12 f f f t f i 1 23 "25" 100 0 0 100  text_int4 - _null_ ));
+DATA(insert OID = 819 (  int4			   PGNSP PGUID 12 f f t f i 1 23 "25"  text_int4 - _null_ ));
 DESCR("convert text to int4");
 
-DATA(insert OID = 838 (  float8			   PGNSP PGUID 12 f f f t f i 1 701 "25" 100 0 0 100  text_float8 - _null_ ));
+DATA(insert OID = 838 (  float8			   PGNSP PGUID 12 f f t f i 1 701 "25"  text_float8 - _null_ ));
 DESCR("convert text to float8");
-DATA(insert OID = 839 (  float4			   PGNSP PGUID 12 f f f t f i 1 700 "25" 100 0 0 100  text_float4 - _null_ ));
+DATA(insert OID = 839 (  float4			   PGNSP PGUID 12 f f t f i 1 700 "25"  text_float4 - _null_ ));
 DESCR("convert text to float4");
-DATA(insert OID = 840 (  text			   PGNSP PGUID 12 f f t t f i 1  25 "701" 100 0 0 100  float8_text - _null_ ));
+DATA(insert OID = 840 (  text			   PGNSP PGUID 12 f f t f i 1  25 "701"  float8_text - _null_ ));
 DESCR("convert float8 to text");
-DATA(insert OID = 841 (  text			   PGNSP PGUID 12 f f t t f i 1  25 "700" 100 0 0 100  float4_text - _null_ ));
+DATA(insert OID = 841 (  text			   PGNSP PGUID 12 f f t f i 1  25 "700"  float4_text - _null_ ));
 DESCR("convert float4 to text");
 
-DATA(insert OID =  846 (  cash_mul_flt4    PGNSP PGUID 12 f f f t f i 2 790 "790 700" 100 0 0 100  cash_mul_flt4 - _null_ ));
+DATA(insert OID =  846 (  cash_mul_flt4    PGNSP PGUID 12 f f t f i 2 790 "790 700"  cash_mul_flt4 - _null_ ));
 DESCR("multiply");
-DATA(insert OID =  847 (  cash_div_flt4    PGNSP PGUID 12 f f f t f i 2 790 "790 700" 100 0 0 100  cash_div_flt4 - _null_ ));
+DATA(insert OID =  847 (  cash_div_flt4    PGNSP PGUID 12 f f t f i 2 790 "790 700"  cash_div_flt4 - _null_ ));
 DESCR("divide");
-DATA(insert OID =  848 (  flt4_mul_cash    PGNSP PGUID 12 f f f t f i 2 790 "700 790" 100 0 0 100  flt4_mul_cash - _null_ ));
+DATA(insert OID =  848 (  flt4_mul_cash    PGNSP PGUID 12 f f t f i 2 790 "700 790"  flt4_mul_cash - _null_ ));
 DESCR("multiply");
 
-DATA(insert OID =  849 (  position		   PGNSP PGUID 12 f f f t f i 2 23 "25 25" 100 0 0 100 textpos - _null_ ));
+DATA(insert OID =  849 (  position		   PGNSP PGUID 12 f f t f i 2 23 "25 25" textpos - _null_ ));
 DESCR("return position of substring");
-DATA(insert OID =  850 (  textlike		   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100 textlike - _null_ ));
+DATA(insert OID =  850 (  textlike		   PGNSP PGUID 12 f f t f i 2 16 "25 25" textlike - _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID =  851 (  textnlike		   PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100 textnlike - _null_ ));
+DATA(insert OID =  851 (  textnlike		   PGNSP PGUID 12 f f t f i 2 16 "25 25" textnlike - _null_ ));
 DESCR("does not match LIKE expression");
 
-DATA(insert OID =  852 (  int48eq		   PGNSP PGUID 12 f f f t f i 2 16 "23 20" 100 0 0 100	int48eq - _null_ ));
+DATA(insert OID =  852 (  int48eq		   PGNSP PGUID 12 f f t f i 2 16 "23 20"	int48eq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  853 (  int48ne		   PGNSP PGUID 12 f f f t f i 2 16 "23 20" 100 0 0 100	int48ne - _null_ ));
+DATA(insert OID =  853 (  int48ne		   PGNSP PGUID 12 f f t f i 2 16 "23 20"	int48ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID =  854 (  int48lt		   PGNSP PGUID 12 f f f t f i 2 16 "23 20" 100 0 0 100	int48lt - _null_ ));
+DATA(insert OID =  854 (  int48lt		   PGNSP PGUID 12 f f t f i 2 16 "23 20"	int48lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID =  855 (  int48gt		   PGNSP PGUID 12 f f f t f i 2 16 "23 20" 100 0 0 100	int48gt - _null_ ));
+DATA(insert OID =  855 (  int48gt		   PGNSP PGUID 12 f f t f i 2 16 "23 20"	int48gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID =  856 (  int48le		   PGNSP PGUID 12 f f f t f i 2 16 "23 20" 100 0 0 100	int48le - _null_ ));
+DATA(insert OID =  856 (  int48le		   PGNSP PGUID 12 f f t f i 2 16 "23 20"	int48le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  857 (  int48ge		   PGNSP PGUID 12 f f f t f i 2 16 "23 20" 100 0 0 100	int48ge - _null_ ));
+DATA(insert OID =  857 (  int48ge		   PGNSP PGUID 12 f f t f i 2 16 "23 20"	int48ge - _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID =  858 (  namelike		   PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100	namelike - _null_ ));
+DATA(insert OID =  858 (  namelike		   PGNSP PGUID 12 f f t f i 2 16 "19 25"	namelike - _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID =  859 (  namenlike		   PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100	namenlike - _null_ ));
+DATA(insert OID =  859 (  namenlike		   PGNSP PGUID 12 f f t f i 2 16 "19 25"	namenlike - _null_ ));
 DESCR("does not match LIKE expression");
 
-DATA(insert OID =  860 (  bpchar		   PGNSP PGUID 12 f f t t f i 1 1042 "18" 100 0 0 100  char_bpchar - _null_ ));
+DATA(insert OID =  860 (  bpchar		   PGNSP PGUID 12 f f t f i 1 1042 "18"  char_bpchar - _null_ ));
 DESCR("convert char to char()");
 
-DATA(insert OID =  862 (  int4_mul_cash		   PGNSP PGUID 12 f f f t f i 2 790 "23 790" 100 0 0 100  int4_mul_cash - _null_ ));
+DATA(insert OID =  862 (  int4_mul_cash		   PGNSP PGUID 12 f f t f i 2 790 "23 790"  int4_mul_cash - _null_ ));
 DESCR("multiply");
-DATA(insert OID =  863 (  int2_mul_cash		   PGNSP PGUID 12 f f f t f i 2 790 "21 790" 100 0 0 100  int2_mul_cash - _null_ ));
+DATA(insert OID =  863 (  int2_mul_cash		   PGNSP PGUID 12 f f t f i 2 790 "21 790"  int2_mul_cash - _null_ ));
 DESCR("multiply");
-DATA(insert OID =  864 (  cash_mul_int4		   PGNSP PGUID 12 f f f t f i 2 790 "790 23" 100 0 0 100  cash_mul_int4 - _null_ ));
+DATA(insert OID =  864 (  cash_mul_int4		   PGNSP PGUID 12 f f t f i 2 790 "790 23"  cash_mul_int4 - _null_ ));
 DESCR("multiply");
-DATA(insert OID =  865 (  cash_div_int4		   PGNSP PGUID 12 f f f t f i 2 790 "790 23" 100 0 0 100  cash_div_int4 - _null_ ));
+DATA(insert OID =  865 (  cash_div_int4		   PGNSP PGUID 12 f f t f i 2 790 "790 23"  cash_div_int4 - _null_ ));
 DESCR("divide");
-DATA(insert OID =  866 (  cash_mul_int2		   PGNSP PGUID 12 f f f t f i 2 790 "790 21" 100 0 0 100  cash_mul_int2 - _null_ ));
+DATA(insert OID =  866 (  cash_mul_int2		   PGNSP PGUID 12 f f t f i 2 790 "790 21"  cash_mul_int2 - _null_ ));
 DESCR("multiply");
-DATA(insert OID =  867 (  cash_div_int2		   PGNSP PGUID 12 f f f t f i 2 790 "790 21" 100 0 0 100  cash_div_int2 - _null_ ));
+DATA(insert OID =  867 (  cash_div_int2		   PGNSP PGUID 12 f f t f i 2 790 "790 21"  cash_div_int2 - _null_ ));
 DESCR("divide");
 
-DATA(insert OID =  886 (  cash_in		   PGNSP PGUID 12 f f f t f i 1 790 "0" 100 0 0 100  cash_in - _null_ ));
+DATA(insert OID =  886 (  cash_in		   PGNSP PGUID 12 f f t f i 1 790 "0"  cash_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  887 (  cash_out		   PGNSP PGUID 12 f f f t f i 1  23 "0" 100 0 0 100  cash_out - _null_ ));
+DATA(insert OID =  887 (  cash_out		   PGNSP PGUID 12 f f t f i 1  23 "0"  cash_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID =  888 (  cash_eq		   PGNSP PGUID 12 f f f t f i 2  16 "790 790" 100 0 0 100  cash_eq - _null_ ));
+DATA(insert OID =  888 (  cash_eq		   PGNSP PGUID 12 f f t f i 2  16 "790 790"  cash_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID =  889 (  cash_ne		   PGNSP PGUID 12 f f f t f i 2  16 "790 790" 100 0 0 100  cash_ne - _null_ ));
+DATA(insert OID =  889 (  cash_ne		   PGNSP PGUID 12 f f t f i 2  16 "790 790"  cash_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID =  890 (  cash_lt		   PGNSP PGUID 12 f f f t f i 2  16 "790 790" 100 0 0 100  cash_lt - _null_ ));
+DATA(insert OID =  890 (  cash_lt		   PGNSP PGUID 12 f f t f i 2  16 "790 790"  cash_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID =  891 (  cash_le		   PGNSP PGUID 12 f f f t f i 2  16 "790 790" 100 0 0 100  cash_le - _null_ ));
+DATA(insert OID =  891 (  cash_le		   PGNSP PGUID 12 f f t f i 2  16 "790 790"  cash_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  892 (  cash_gt		   PGNSP PGUID 12 f f f t f i 2  16 "790 790" 100 0 0 100  cash_gt - _null_ ));
+DATA(insert OID =  892 (  cash_gt		   PGNSP PGUID 12 f f t f i 2  16 "790 790"  cash_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID =  893 (  cash_ge		   PGNSP PGUID 12 f f f t f i 2  16 "790 790" 100 0 0 100  cash_ge - _null_ ));
+DATA(insert OID =  893 (  cash_ge		   PGNSP PGUID 12 f f t f i 2  16 "790 790"  cash_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID =  894 (  cash_pl		   PGNSP PGUID 12 f f f t f i 2 790 "790 790" 100 0 0 100  cash_pl - _null_ ));
+DATA(insert OID =  894 (  cash_pl		   PGNSP PGUID 12 f f t f i 2 790 "790 790"  cash_pl - _null_ ));
 DESCR("add");
-DATA(insert OID =  895 (  cash_mi		   PGNSP PGUID 12 f f f t f i 2 790 "790 790" 100 0 0 100  cash_mi - _null_ ));
+DATA(insert OID =  895 (  cash_mi		   PGNSP PGUID 12 f f t f i 2 790 "790 790"  cash_mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID =  896 (  cash_mul_flt8    PGNSP PGUID 12 f f f t f i 2 790 "790 701" 100 0 0 100  cash_mul_flt8 - _null_ ));
+DATA(insert OID =  896 (  cash_mul_flt8    PGNSP PGUID 12 f f t f i 2 790 "790 701"  cash_mul_flt8 - _null_ ));
 DESCR("multiply");
-DATA(insert OID =  897 (  cash_div_flt8    PGNSP PGUID 12 f f f t f i 2 790 "790 701" 100 0 0 100  cash_div_flt8 - _null_ ));
+DATA(insert OID =  897 (  cash_div_flt8    PGNSP PGUID 12 f f t f i 2 790 "790 701"  cash_div_flt8 - _null_ ));
 DESCR("divide");
-DATA(insert OID =  898 (  cashlarger	   PGNSP PGUID 12 f f f t f i 2 790 "790 790" 100 0 0 100  cashlarger - _null_ ));
+DATA(insert OID =  898 (  cashlarger	   PGNSP PGUID 12 f f t f i 2 790 "790 790"  cashlarger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID =  899 (  cashsmaller	   PGNSP PGUID 12 f f f t f i 2 790 "790 790" 100 0 0 100  cashsmaller - _null_ ));
+DATA(insert OID =  899 (  cashsmaller	   PGNSP PGUID 12 f f t f i 2 790 "790 790"  cashsmaller - _null_ ));
 DESCR("smaller of two");
-DATA(insert OID =  919 (  flt8_mul_cash    PGNSP PGUID 12 f f f t f i 2 790 "701 790" 100 0 0 100  flt8_mul_cash - _null_ ));
+DATA(insert OID =  919 (  flt8_mul_cash    PGNSP PGUID 12 f f t f i 2 790 "701 790"  flt8_mul_cash - _null_ ));
 DESCR("multiply");
-DATA(insert OID =  935 (  cash_words	   PGNSP PGUID 12 f f f t f i 1  25 "790" 100 0 0 100  cash_words - _null_ ));
+DATA(insert OID =  935 (  cash_words	   PGNSP PGUID 12 f f t f i 1  25 "790"  cash_words - _null_ ));
 DESCR("output amount as words");
 
 /* OIDS 900 - 999 */
 
-DATA(insert OID = 940 (  mod			   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2mod - _null_ ));
+DATA(insert OID = 940 (  mod			   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 941 (  mod			   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4mod - _null_ ));
+DATA(insert OID = 941 (  mod			   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 942 (  mod			   PGNSP PGUID 12 f f f t f i 2 23 "21 23" 100 0 0 100	int24mod - _null_ ));
+DATA(insert OID = 942 (  mod			   PGNSP PGUID 12 f f t f i 2 23 "21 23"	int24mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 943 (  mod			   PGNSP PGUID 12 f f f t f i 2 23 "23 21" 100 0 0 100	int42mod - _null_ ));
+DATA(insert OID = 943 (  mod			   PGNSP PGUID 12 f f t f i 2 23 "23 21"	int42mod - _null_ ));
 DESCR("modulus");
 
-DATA(insert OID = 945 (  int8mod		   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8mod - _null_ ));
+DATA(insert OID = 945 (  int8mod		   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 947 (  mod			   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8mod - _null_ ));
+DATA(insert OID = 947 (  mod			   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8mod - _null_ ));
 DESCR("modulus");
 
-DATA(insert OID = 944 (  char			   PGNSP PGUID 12 f f t t f i 1 18 "25" 100 0 0 100  text_char - _null_ ));
+DATA(insert OID = 944 (  char			   PGNSP PGUID 12 f f t f i 1 18 "25"  text_char - _null_ ));
 DESCR("convert text to char");
-DATA(insert OID = 946 (  text			   PGNSP PGUID 12 f f t t f i 1 25 "18" 100 0 0 100  char_text - _null_ ));
+DATA(insert OID = 946 (  text			   PGNSP PGUID 12 f f t f i 1 25 "18"  char_text - _null_ ));
 DESCR("convert char to text");
 
-DATA(insert OID = 950 (  istrue			   PGNSP PGUID 12 f f f f f i 1 16 "16" 100 0 0 100  istrue - _null_ ));
+DATA(insert OID = 950 (  istrue			   PGNSP PGUID 12 f f f f i 1 16 "16"  istrue - _null_ ));
 DESCR("bool is true (not false or unknown)");
-DATA(insert OID = 951 (  isfalse		   PGNSP PGUID 12 f f f f f i 1 16 "16" 100 0 0 100  isfalse - _null_ ));
+DATA(insert OID = 951 (  isfalse		   PGNSP PGUID 12 f f f f i 1 16 "16"  isfalse - _null_ ));
 DESCR("bool is false (not true or unknown)");
 
-DATA(insert OID = 952 (  lo_open		   PGNSP PGUID 12 f f f t f v 2 23 "26 23" 100 0 0 100	lo_open - _null_ ));
+DATA(insert OID = 952 (  lo_open		   PGNSP PGUID 12 f f t f v 2 23 "26 23"	lo_open - _null_ ));
 DESCR("large object open");
-DATA(insert OID = 953 (  lo_close		   PGNSP PGUID 12 f f f t f v 1 23 "23" 100 0 0 100  lo_close - _null_ ));
+DATA(insert OID = 953 (  lo_close		   PGNSP PGUID 12 f f t f v 1 23 "23"  lo_close - _null_ ));
 DESCR("large object close");
-DATA(insert OID = 954 (  loread			   PGNSP PGUID 12 f f f t f v 2 17 "23 23" 100 0 0 100	loread - _null_ ));
+DATA(insert OID = 954 (  loread			   PGNSP PGUID 12 f f t f v 2 17 "23 23"	loread - _null_ ));
 DESCR("large object read");
-DATA(insert OID = 955 (  lowrite		   PGNSP PGUID 12 f f f t f v 2 23 "23 17" 100 0 0 100	lowrite - _null_ ));
+DATA(insert OID = 955 (  lowrite		   PGNSP PGUID 12 f f t f v 2 23 "23 17"	lowrite - _null_ ));
 DESCR("large object write");
-DATA(insert OID = 956 (  lo_lseek		   PGNSP PGUID 12 f f f t f v 3 23 "23 23 23" 100 0 0 100  lo_lseek - _null_ ));
+DATA(insert OID = 956 (  lo_lseek		   PGNSP PGUID 12 f f t f v 3 23 "23 23 23"  lo_lseek - _null_ ));
 DESCR("large object seek");
-DATA(insert OID = 957 (  lo_creat		   PGNSP PGUID 12 f f f t f v 1 26 "23" 100 0 0 100  lo_creat - _null_ ));
+DATA(insert OID = 957 (  lo_creat		   PGNSP PGUID 12 f f t f v 1 26 "23"  lo_creat - _null_ ));
 DESCR("large object create");
-DATA(insert OID = 958 (  lo_tell		   PGNSP PGUID 12 f f f t f v 1 23 "23" 100 0 0 100  lo_tell - _null_ ));
+DATA(insert OID = 958 (  lo_tell		   PGNSP PGUID 12 f f t f v 1 23 "23"  lo_tell - _null_ ));
 DESCR("large object position");
 
-DATA(insert OID = 959 (  on_pl			   PGNSP PGUID 12 f f f t f i 2  16 "600 628" 100 0 0 100  on_pl - _null_ ));
+DATA(insert OID = 959 (  on_pl			   PGNSP PGUID 12 f f t f i 2  16 "600 628"  on_pl - _null_ ));
 DESCR("point on line?");
-DATA(insert OID = 960 (  on_sl			   PGNSP PGUID 12 f f f t f i 2  16 "601 628" 100 0 0 100  on_sl - _null_ ));
+DATA(insert OID = 960 (  on_sl			   PGNSP PGUID 12 f f t f i 2  16 "601 628"  on_sl - _null_ ));
 DESCR("lseg on line?");
-DATA(insert OID = 961 (  close_pl		   PGNSP PGUID 12 f f f t f i 2 600 "600 628" 100 0 0 100  close_pl - _null_ ));
+DATA(insert OID = 961 (  close_pl		   PGNSP PGUID 12 f f t f i 2 600 "600 628"  close_pl - _null_ ));
 DESCR("closest point on line");
-DATA(insert OID = 962 (  close_sl		   PGNSP PGUID 12 f f f t f i 2 600 "601 628" 100 0 0 100  close_sl - _null_ ));
+DATA(insert OID = 962 (  close_sl		   PGNSP PGUID 12 f f t f i 2 600 "601 628"  close_sl - _null_ ));
 DESCR("closest point to line segment on line");
-DATA(insert OID = 963 (  close_lb		   PGNSP PGUID 12 f f f t f i 2 600 "628 603" 100 0 0 100  close_lb - _null_ ));
+DATA(insert OID = 963 (  close_lb		   PGNSP PGUID 12 f f t f i 2 600 "628 603"  close_lb - _null_ ));
 DESCR("closest point to line on box");
 
-DATA(insert OID = 964 (  lo_unlink		   PGNSP PGUID 12 f f f t f v 1  23 "26" 100 0 0 100  lo_unlink - _null_ ));
+DATA(insert OID = 964 (  lo_unlink		   PGNSP PGUID 12 f f t f v 1  23 "26"  lo_unlink - _null_ ));
 DESCR("large object unlink(delete)");
 
-DATA(insert OID = 973 (  path_inter		   PGNSP PGUID 12 f f f t f i 2  16 "602 602" 100 0 0 100  path_inter - _null_ ));
+DATA(insert OID = 973 (  path_inter		   PGNSP PGUID 12 f f t f i 2  16 "602 602"  path_inter - _null_ ));
 DESCR("paths intersect?");
-DATA(insert OID = 975 (  area			   PGNSP PGUID 12 f f f t f i 1 701 "603" 100 0 0 100  box_area - _null_ ));
+DATA(insert OID = 975 (  area			   PGNSP PGUID 12 f f t f i 1 701 "603"  box_area - _null_ ));
 DESCR("box area");
-DATA(insert OID = 976 (  width			   PGNSP PGUID 12 f f f t f i 1 701 "603" 100 0 0 100  box_width - _null_ ));
+DATA(insert OID = 976 (  width			   PGNSP PGUID 12 f f t f i 1 701 "603"  box_width - _null_ ));
 DESCR("box width");
-DATA(insert OID = 977 (  height			   PGNSP PGUID 12 f f f t f i 1 701 "603" 100 0 0 100  box_height - _null_ ));
+DATA(insert OID = 977 (  height			   PGNSP PGUID 12 f f t f i 1 701 "603"  box_height - _null_ ));
 DESCR("box height");
-DATA(insert OID = 978 (  box_distance	   PGNSP PGUID 12 f f f t f i 2 701 "603 603" 100 0 0 100  box_distance - _null_ ));
+DATA(insert OID = 978 (  box_distance	   PGNSP PGUID 12 f f t f i 2 701 "603 603"  box_distance - _null_ ));
 DESCR("distance between boxes");
-DATA(insert OID = 980 (  box_intersect	   PGNSP PGUID 12 f f f t f i 2 603 "603 603" 100 0 0 100  box_intersect - _null_ ));
+DATA(insert OID = 980 (  box_intersect	   PGNSP PGUID 12 f f t f i 2 603 "603 603"  box_intersect - _null_ ));
 DESCR("box intersection (another box)");
-DATA(insert OID = 981 (  diagonal		   PGNSP PGUID 12 f f f t f i 1 601 "603" 100 0 0 100  box_diagonal - _null_ ));
+DATA(insert OID = 981 (  diagonal		   PGNSP PGUID 12 f f t f i 1 601 "603"  box_diagonal - _null_ ));
 DESCR("box diagonal");
-DATA(insert OID = 982 (  path_n_lt		   PGNSP PGUID 12 f f f t f i 2 16 "602 602" 100 0 0 100  path_n_lt - _null_ ));
+DATA(insert OID = 982 (  path_n_lt		   PGNSP PGUID 12 f f t f i 2 16 "602 602"  path_n_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 983 (  path_n_gt		   PGNSP PGUID 12 f f f t f i 2 16 "602 602" 100 0 0 100  path_n_gt - _null_ ));
+DATA(insert OID = 983 (  path_n_gt		   PGNSP PGUID 12 f f t f i 2 16 "602 602"  path_n_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 984 (  path_n_eq		   PGNSP PGUID 12 f f f t f i 2 16 "602 602" 100 0 0 100  path_n_eq - _null_ ));
+DATA(insert OID = 984 (  path_n_eq		   PGNSP PGUID 12 f f t f i 2 16 "602 602"  path_n_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 985 (  path_n_le		   PGNSP PGUID 12 f f f t f i 2 16 "602 602" 100 0 0 100  path_n_le - _null_ ));
+DATA(insert OID = 985 (  path_n_le		   PGNSP PGUID 12 f f t f i 2 16 "602 602"  path_n_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 986 (  path_n_ge		   PGNSP PGUID 12 f f f t f i 2 16 "602 602" 100 0 0 100  path_n_ge - _null_ ));
+DATA(insert OID = 986 (  path_n_ge		   PGNSP PGUID 12 f f t f i 2 16 "602 602"  path_n_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 987 (  path_length	   PGNSP PGUID 12 f f f t f i 1 701 "602" 100 0 0 100  path_length - _null_ ));
+DATA(insert OID = 987 (  path_length	   PGNSP PGUID 12 f f t f i 1 701 "602"  path_length - _null_ ));
 DESCR("sum of path segments");
-DATA(insert OID = 988 (  point_ne		   PGNSP PGUID 12 f f f t f i 2 16 "600 600" 100 0 0 100  point_ne - _null_ ));
+DATA(insert OID = 988 (  point_ne		   PGNSP PGUID 12 f f t f i 2 16 "600 600"  point_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 989 (  point_vert		   PGNSP PGUID 12 f f f t f i 2 16 "600 600" 100 0 0 100  point_vert - _null_ ));
+DATA(insert OID = 989 (  point_vert		   PGNSP PGUID 12 f f t f i 2 16 "600 600"  point_vert - _null_ ));
 DESCR("vertically aligned?");
-DATA(insert OID = 990 (  point_horiz	   PGNSP PGUID 12 f f f t f i 2 16 "600 600" 100 0 0 100  point_horiz - _null_ ));
+DATA(insert OID = 990 (  point_horiz	   PGNSP PGUID 12 f f t f i 2 16 "600 600"  point_horiz - _null_ ));
 DESCR("horizontally aligned?");
-DATA(insert OID = 991 (  point_distance    PGNSP PGUID 12 f f f t f i 2 701 "600 600" 100 0 0 100  point_distance - _null_ ));
+DATA(insert OID = 991 (  point_distance    PGNSP PGUID 12 f f t f i 2 701 "600 600"  point_distance - _null_ ));
 DESCR("distance between");
-DATA(insert OID = 992 (  slope			   PGNSP PGUID 12 f f f t f i 2 701 "600 600" 100 0 0 100  point_slope - _null_ ));
+DATA(insert OID = 992 (  slope			   PGNSP PGUID 12 f f t f i 2 701 "600 600"  point_slope - _null_ ));
 DESCR("slope between points");
-DATA(insert OID = 993 (  lseg			   PGNSP PGUID 12 f f f t f i 2 601 "600 600" 100 0 0 100  lseg_construct - _null_ ));
+DATA(insert OID = 993 (  lseg			   PGNSP PGUID 12 f f t f i 2 601 "600 600"  lseg_construct - _null_ ));
 DESCR("convert points to line segment");
-DATA(insert OID = 994 (  lseg_intersect    PGNSP PGUID 12 f f f t f i 2 16 "601 601" 100 0 0 100  lseg_intersect - _null_ ));
+DATA(insert OID = 994 (  lseg_intersect    PGNSP PGUID 12 f f t f i 2 16 "601 601"  lseg_intersect - _null_ ));
 DESCR("intersect?");
-DATA(insert OID = 995 (  lseg_parallel	   PGNSP PGUID 12 f f f t f i 2 16 "601 601" 100 0 0 100  lseg_parallel - _null_ ));
+DATA(insert OID = 995 (  lseg_parallel	   PGNSP PGUID 12 f f t f i 2 16 "601 601"  lseg_parallel - _null_ ));
 DESCR("parallel?");
-DATA(insert OID = 996 (  lseg_perp		   PGNSP PGUID 12 f f f t f i 2 16 "601 601" 100 0 0 100  lseg_perp - _null_ ));
+DATA(insert OID = 996 (  lseg_perp		   PGNSP PGUID 12 f f t f i 2 16 "601 601"  lseg_perp - _null_ ));
 DESCR("perpendicular?");
-DATA(insert OID = 997 (  lseg_vertical	   PGNSP PGUID 12 f f f t f i 1 16 "601" 100 0 0 100  lseg_vertical - _null_ ));
+DATA(insert OID = 997 (  lseg_vertical	   PGNSP PGUID 12 f f t f i 1 16 "601"  lseg_vertical - _null_ ));
 DESCR("vertical?");
-DATA(insert OID = 998 (  lseg_horizontal   PGNSP PGUID 12 f f f t f i 1 16 "601" 100 0 0 100  lseg_horizontal - _null_ ));
+DATA(insert OID = 998 (  lseg_horizontal   PGNSP PGUID 12 f f t f i 1 16 "601"  lseg_horizontal - _null_ ));
 DESCR("horizontal?");
-DATA(insert OID = 999 (  lseg_eq		   PGNSP PGUID 12 f f f t f i 2 16 "601 601" 100 0 0 100  lseg_eq - _null_ ));
+DATA(insert OID = 999 (  lseg_eq		   PGNSP PGUID 12 f f t f i 2 16 "601 601"  lseg_eq - _null_ ));
 DESCR("equal");
 
-DATA(insert OID =  748 (  date			   PGNSP PGUID 12 f f f t f s 1 1082 "25" 100 0 0 100 text_date - _null_ ));
+DATA(insert OID =  748 (  date			   PGNSP PGUID 12 f f t f s 1 1082 "25" text_date - _null_ ));
 DESCR("convert text to date");
-DATA(insert OID =  749 (  text			   PGNSP PGUID 12 f f t t f s 1 25 "1082" 100 0 0 100 date_text - _null_ ));
+DATA(insert OID =  749 (  text			   PGNSP PGUID 12 f f t f s 1 25 "1082" date_text - _null_ ));
 DESCR("convert date to text");
-DATA(insert OID =  837 (  time			   PGNSP PGUID 12 f f f t f s 1 1083 "25" 100 0 0 100 text_time - _null_ ));
+DATA(insert OID =  837 (  time			   PGNSP PGUID 12 f f t f s 1 1083 "25" text_time - _null_ ));
 DESCR("convert text to time");
-DATA(insert OID =  948 (  text			   PGNSP PGUID 12 f f t t f i 1 25 "1083" 100 0 0 100 time_text - _null_ ));
+DATA(insert OID =  948 (  text			   PGNSP PGUID 12 f f t f i 1 25 "1083" time_text - _null_ ));
 DESCR("convert time to text");
-DATA(insert OID =  938 (  timetz		   PGNSP PGUID 12 f f f t f s 1 1266 "25" 100 0 0 100 text_timetz - _null_ ));
+DATA(insert OID =  938 (  timetz		   PGNSP PGUID 12 f f t f s 1 1266 "25" text_timetz - _null_ ));
 DESCR("convert text to timetz");
-DATA(insert OID =  939 (  text			   PGNSP PGUID 12 f f t t f i 1 25 "1266" 100 0 0 100 timetz_text - _null_ ));
+DATA(insert OID =  939 (  text			   PGNSP PGUID 12 f f t f i 1 25 "1266" timetz_text - _null_ ));
 DESCR("convert timetz to text");
 
 /* OIDS 1000 - 1999 */
 
-DATA(insert OID = 1026 (  timezone		   PGNSP PGUID 12 f f f t f s 2 1186 "1186 1184" 100 0 0 100	timestamptz_izone - _null_ ));
+DATA(insert OID = 1026 (  timezone		   PGNSP PGUID 12 f f t f s 2 1186 "1186 1184"	timestamptz_izone - _null_ ));
 DESCR("time zone");
 
-DATA(insert OID = 1029 (  nullvalue		   PGNSP PGUID 12 f f f f f i 1 16 "0" 100 0 0 100	nullvalue - _null_ ));
+DATA(insert OID = 1029 (  nullvalue		   PGNSP PGUID 12 f f f f i 1 16 "0"	nullvalue - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1030 (  nonnullvalue	   PGNSP PGUID 12 f f f f f i 1 16 "0" 100 0 0 100	nonnullvalue - _null_ ));
+DATA(insert OID = 1030 (  nonnullvalue	   PGNSP PGUID 12 f f f f i 1 16 "0"	nonnullvalue - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1031 (  aclitemin		   PGNSP PGUID 12 f f f t f s 1 1033 "0" 100 0 0 100  aclitemin - _null_ ));
+DATA(insert OID = 1031 (  aclitemin		   PGNSP PGUID 12 f f t f s 1 1033 "0"  aclitemin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1032 (  aclitemout	   PGNSP PGUID 12 f f f t f s 1 23 "1033" 100 0 0 100  aclitemout - _null_ ));
+DATA(insert OID = 1032 (  aclitemout	   PGNSP PGUID 12 f f t f s 1 23 "1033"  aclitemout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1035 (  aclinsert		   PGNSP PGUID 12 f f f t f s 2 1034 "1034 1033" 100 0 0 100  aclinsert - _null_ ));
+DATA(insert OID = 1035 (  aclinsert		   PGNSP PGUID 12 f f t f s 2 1034 "1034 1033"  aclinsert - _null_ ));
 DESCR("add/update ACL item");
-DATA(insert OID = 1036 (  aclremove		   PGNSP PGUID 12 f f f t f s 2 1034 "1034 1033" 100 0 0 100  aclremove - _null_ ));
+DATA(insert OID = 1036 (  aclremove		   PGNSP PGUID 12 f f t f s 2 1034 "1034 1033"  aclremove - _null_ ));
 DESCR("remove ACL item");
-DATA(insert OID = 1037 (  aclcontains	   PGNSP PGUID 12 f f f t f s 2 16 "1034 1033" 100 0 0 100	aclcontains - _null_ ));
+DATA(insert OID = 1037 (  aclcontains	   PGNSP PGUID 12 f f t f s 2 16 "1034 1033"	aclcontains - _null_ ));
 DESCR("does ACL contain item?");
-DATA(insert OID = 1038 (  seteval		   PGNSP PGUID 12 f f f t t v 1 23 "26" 100 0 0 100  seteval - _null_ ));
+DATA(insert OID = 1038 (  seteval		   PGNSP PGUID 12 f f t t v 1 23 "26"  seteval - _null_ ));
 DESCR("internal function supporting PostQuel-style sets");
-DATA(insert OID = 1044 (  bpcharin		   PGNSP PGUID 12 f f f t f i 3 1042 "0 26 23" 100 0 0 100 bpcharin - _null_ ));
+DATA(insert OID = 1044 (  bpcharin		   PGNSP PGUID 12 f f t f i 3 1042 "0 26 23" bpcharin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1045 (  bpcharout		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	bpcharout - _null_ ));
+DATA(insert OID = 1045 (  bpcharout		   PGNSP PGUID 12 f f t f i 1 23 "0"	bpcharout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1046 (  varcharin		   PGNSP PGUID 12 f f f t f i 3 1043 "0 26 23" 100 0 0 100 varcharin - _null_ ));
+DATA(insert OID = 1046 (  varcharin		   PGNSP PGUID 12 f f t f i 3 1043 "0 26 23" varcharin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1047 (  varcharout	   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	varcharout - _null_ ));
+DATA(insert OID = 1047 (  varcharout	   PGNSP PGUID 12 f f t f i 1 23 "0"	varcharout - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1048 (  bpchareq		   PGNSP PGUID 12 f f f t f i 2 16 "1042 1042" 100 0 0 100	bpchareq - _null_ ));
+DATA(insert OID = 1048 (  bpchareq		   PGNSP PGUID 12 f f t f i 2 16 "1042 1042"	bpchareq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1049 (  bpcharlt		   PGNSP PGUID 12 f f f t f i 2 16 "1042 1042" 100 0 0 100	bpcharlt - _null_ ));
+DATA(insert OID = 1049 (  bpcharlt		   PGNSP PGUID 12 f f t f i 2 16 "1042 1042"	bpcharlt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1050 (  bpcharle		   PGNSP PGUID 12 f f f t f i 2 16 "1042 1042" 100 0 0 100	bpcharle - _null_ ));
+DATA(insert OID = 1050 (  bpcharle		   PGNSP PGUID 12 f f t f i 2 16 "1042 1042"	bpcharle - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1051 (  bpchargt		   PGNSP PGUID 12 f f f t f i 2 16 "1042 1042" 100 0 0 100	bpchargt - _null_ ));
+DATA(insert OID = 1051 (  bpchargt		   PGNSP PGUID 12 f f t f i 2 16 "1042 1042"	bpchargt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1052 (  bpcharge		   PGNSP PGUID 12 f f f t f i 2 16 "1042 1042" 100 0 0 100	bpcharge - _null_ ));
+DATA(insert OID = 1052 (  bpcharge		   PGNSP PGUID 12 f f t f i 2 16 "1042 1042"	bpcharge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1053 (  bpcharne		   PGNSP PGUID 12 f f f t f i 2 16 "1042 1042" 100 0 0 100	bpcharne - _null_ ));
+DATA(insert OID = 1053 (  bpcharne		   PGNSP PGUID 12 f f t f i 2 16 "1042 1042"	bpcharne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1070 (  varchareq		   PGNSP PGUID 12 f f f t f i 2 16 "1043 1043" 100 0 0 100	varchareq - _null_ ));
+DATA(insert OID = 1070 (  varchareq		   PGNSP PGUID 12 f f t f i 2 16 "1043 1043"	varchareq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1071 (  varcharlt		   PGNSP PGUID 12 f f f t f i 2 16 "1043 1043" 100 0 0 100	varcharlt - _null_ ));
+DATA(insert OID = 1071 (  varcharlt		   PGNSP PGUID 12 f f t f i 2 16 "1043 1043"	varcharlt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1072 (  varcharle		   PGNSP PGUID 12 f f f t f i 2 16 "1043 1043" 100 0 0 100	varcharle - _null_ ));
+DATA(insert OID = 1072 (  varcharle		   PGNSP PGUID 12 f f t f i 2 16 "1043 1043"	varcharle - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1073 (  varchargt		   PGNSP PGUID 12 f f f t f i 2 16 "1043 1043" 100 0 0 100	varchargt - _null_ ));
+DATA(insert OID = 1073 (  varchargt		   PGNSP PGUID 12 f f t f i 2 16 "1043 1043"	varchargt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1074 (  varcharge		   PGNSP PGUID 12 f f f t f i 2 16 "1043 1043" 100 0 0 100	varcharge - _null_ ));
+DATA(insert OID = 1074 (  varcharge		   PGNSP PGUID 12 f f t f i 2 16 "1043 1043"	varcharge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1075 (  varcharne		   PGNSP PGUID 12 f f f t f i 2 16 "1043 1043" 100 0 0 100	varcharne - _null_ ));
+DATA(insert OID = 1075 (  varcharne		   PGNSP PGUID 12 f f t f i 2 16 "1043 1043"	varcharne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1078 (  bpcharcmp		   PGNSP PGUID 12 f f f t f i 2 23 "1042 1042" 100 0 0 100	bpcharcmp - _null_ ));
+DATA(insert OID = 1078 (  bpcharcmp		   PGNSP PGUID 12 f f t f i 2 23 "1042 1042"	bpcharcmp - _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1079 (  varcharcmp	   PGNSP PGUID 12 f f f t f i 2 23 "1043 1043" 100 0 0 100	varcharcmp - _null_ ));
+DATA(insert OID = 1079 (  varcharcmp	   PGNSP PGUID 12 f f t f i 2 23 "1043 1043"	varcharcmp - _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1080 (  hashbpchar	   PGNSP PGUID 12 f f f t f i 1 23 "1042" 100 0 0 100  hashbpchar - _null_ ));
+DATA(insert OID = 1080 (  hashbpchar	   PGNSP PGUID 12 f f t f i 1 23 "1042"  hashbpchar - _null_ ));
 DESCR("hash");
-DATA(insert OID = 1081 (  format_type	   PGNSP PGUID 12 f f f f f s 2 25 "26 23" 100 0 0 100 format_type - _null_ ));
+DATA(insert OID = 1081 (  format_type	   PGNSP PGUID 12 f f f f s 2 25 "26 23" format_type - _null_ ));
 DESCR("format a type oid and atttypmod to canonical SQL");
-DATA(insert OID = 1084 (  date_in		   PGNSP PGUID 12 f f f t f s 1 1082 "0" 100 0 0 100  date_in - _null_ ));
+DATA(insert OID = 1084 (  date_in		   PGNSP PGUID 12 f f t f s 1 1082 "0"  date_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1085 (  date_out		   PGNSP PGUID 12 f f f t f s 1 23 "0" 100 0 0 100	date_out - _null_ ));
+DATA(insert OID = 1085 (  date_out		   PGNSP PGUID 12 f f t f s 1 23 "0"	date_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1086 (  date_eq		   PGNSP PGUID 12 f f f t f i 2 16 "1082 1082" 100 0 0 100	date_eq - _null_ ));
+DATA(insert OID = 1086 (  date_eq		   PGNSP PGUID 12 f f t f i 2 16 "1082 1082"	date_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1087 (  date_lt		   PGNSP PGUID 12 f f f t f i 2 16 "1082 1082" 100 0 0 100	date_lt - _null_ ));
+DATA(insert OID = 1087 (  date_lt		   PGNSP PGUID 12 f f t f i 2 16 "1082 1082"	date_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1088 (  date_le		   PGNSP PGUID 12 f f f t f i 2 16 "1082 1082" 100 0 0 100	date_le - _null_ ));
+DATA(insert OID = 1088 (  date_le		   PGNSP PGUID 12 f f t f i 2 16 "1082 1082"	date_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1089 (  date_gt		   PGNSP PGUID 12 f f f t f i 2 16 "1082 1082" 100 0 0 100	date_gt - _null_ ));
+DATA(insert OID = 1089 (  date_gt		   PGNSP PGUID 12 f f t f i 2 16 "1082 1082"	date_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1090 (  date_ge		   PGNSP PGUID 12 f f f t f i 2 16 "1082 1082" 100 0 0 100	date_ge - _null_ ));
+DATA(insert OID = 1090 (  date_ge		   PGNSP PGUID 12 f f t f i 2 16 "1082 1082"	date_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1091 (  date_ne		   PGNSP PGUID 12 f f f t f i 2 16 "1082 1082" 100 0 0 100	date_ne - _null_ ));
+DATA(insert OID = 1091 (  date_ne		   PGNSP PGUID 12 f f t f i 2 16 "1082 1082"	date_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1092 (  date_cmp		   PGNSP PGUID 12 f f f t f i 2 23 "1082 1082" 100 0 0 100	date_cmp - _null_ ));
+DATA(insert OID = 1092 (  date_cmp		   PGNSP PGUID 12 f f t f i 2 23 "1082 1082"	date_cmp - _null_ ));
 DESCR("less-equal-greater");
 
 /* OIDS 1100 - 1199 */
 
-DATA(insert OID = 1102 (  time_lt		   PGNSP PGUID 12 f f f t f i 2 16 "1083 1083" 100 0 0 100	time_lt - _null_ ));
+DATA(insert OID = 1102 (  time_lt		   PGNSP PGUID 12 f f t f i 2 16 "1083 1083"	time_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1103 (  time_le		   PGNSP PGUID 12 f f f t f i 2 16 "1083 1083" 100 0 0 100	time_le - _null_ ));
+DATA(insert OID = 1103 (  time_le		   PGNSP PGUID 12 f f t f i 2 16 "1083 1083"	time_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1104 (  time_gt		   PGNSP PGUID 12 f f f t f i 2 16 "1083 1083" 100 0 0 100	time_gt - _null_ ));
+DATA(insert OID = 1104 (  time_gt		   PGNSP PGUID 12 f f t f i 2 16 "1083 1083"	time_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1105 (  time_ge		   PGNSP PGUID 12 f f f t f i 2 16 "1083 1083" 100 0 0 100	time_ge - _null_ ));
+DATA(insert OID = 1105 (  time_ge		   PGNSP PGUID 12 f f t f i 2 16 "1083 1083"	time_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1106 (  time_ne		   PGNSP PGUID 12 f f f t f i 2 16 "1083 1083" 100 0 0 100	time_ne - _null_ ));
+DATA(insert OID = 1106 (  time_ne		   PGNSP PGUID 12 f f t f i 2 16 "1083 1083"	time_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1107 (  time_cmp		   PGNSP PGUID 12 f f f t f i 2 23 "1083 1083" 100 0 0 100	time_cmp - _null_ ));
+DATA(insert OID = 1107 (  time_cmp		   PGNSP PGUID 12 f f t f i 2 23 "1083 1083"	time_cmp - _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1138 (  date_larger	   PGNSP PGUID 12 f f f t f i 2 1082 "1082 1082" 100 0 0 100  date_larger - _null_ ));
+DATA(insert OID = 1138 (  date_larger	   PGNSP PGUID 12 f f t f i 2 1082 "1082 1082"  date_larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1139 (  date_smaller	   PGNSP PGUID 12 f f f t f i 2 1082 "1082 1082" 100 0 0 100  date_smaller - _null_ ));
+DATA(insert OID = 1139 (  date_smaller	   PGNSP PGUID 12 f f t f i 2 1082 "1082 1082"  date_smaller - _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 1140 (  date_mi		   PGNSP PGUID 12 f f f t f i 2 23 "1082 1082" 100 0 0 100	date_mi - _null_ ));
+DATA(insert OID = 1140 (  date_mi		   PGNSP PGUID 12 f f t f i 2 23 "1082 1082"	date_mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1141 (  date_pli		   PGNSP PGUID 12 f f f t f i 2 1082 "1082 23" 100 0 0 100	date_pli - _null_ ));
+DATA(insert OID = 1141 (  date_pli		   PGNSP PGUID 12 f f t f i 2 1082 "1082 23"	date_pli - _null_ ));
 DESCR("add");
-DATA(insert OID = 1142 (  date_mii		   PGNSP PGUID 12 f f f t f i 2 1082 "1082 23" 100 0 0 100	date_mii - _null_ ));
+DATA(insert OID = 1142 (  date_mii		   PGNSP PGUID 12 f f t f i 2 1082 "1082 23"	date_mii - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1143 (  time_in		   PGNSP PGUID 12 f f f t f s 1 1083 "0" 100 0 0 100  time_in - _null_ ));
+DATA(insert OID = 1143 (  time_in		   PGNSP PGUID 12 f f t f s 1 1083 "0"  time_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1144 (  time_out		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	time_out - _null_ ));
+DATA(insert OID = 1144 (  time_out		   PGNSP PGUID 12 f f t f i 1 23 "0"	time_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1145 (  time_eq		   PGNSP PGUID 12 f f f t f i 2 16 "1083 1083" 100 0 0 100	time_eq - _null_ ));
+DATA(insert OID = 1145 (  time_eq		   PGNSP PGUID 12 f f t f i 2 16 "1083 1083"	time_eq - _null_ ));
 DESCR("equal");
 
-DATA(insert OID = 1146 (  circle_add_pt    PGNSP PGUID 12 f f f t f i 2 718 "718 600" 100 0 0 100  circle_add_pt - _null_ ));
+DATA(insert OID = 1146 (  circle_add_pt    PGNSP PGUID 12 f f t f i 2 718 "718 600"  circle_add_pt - _null_ ));
 DESCR("add");
-DATA(insert OID = 1147 (  circle_sub_pt    PGNSP PGUID 12 f f f t f i 2 718 "718 600" 100 0 0 100  circle_sub_pt - _null_ ));
+DATA(insert OID = 1147 (  circle_sub_pt    PGNSP PGUID 12 f f t f i 2 718 "718 600"  circle_sub_pt - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1148 (  circle_mul_pt    PGNSP PGUID 12 f f f t f i 2 718 "718 600" 100 0 0 100  circle_mul_pt - _null_ ));
+DATA(insert OID = 1148 (  circle_mul_pt    PGNSP PGUID 12 f f t f i 2 718 "718 600"  circle_mul_pt - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 1149 (  circle_div_pt    PGNSP PGUID 12 f f f t f i 2 718 "718 600" 100 0 0 100  circle_div_pt - _null_ ));
+DATA(insert OID = 1149 (  circle_div_pt    PGNSP PGUID 12 f f t f i 2 718 "718 600"  circle_div_pt - _null_ ));
 DESCR("divide");
 
-DATA(insert OID = 1150 (  timestamptz_in   PGNSP PGUID 12 f f f t f s 1 1184 "0" 100 0 0 100  timestamptz_in - _null_ ));
+DATA(insert OID = 1150 (  timestamptz_in   PGNSP PGUID 12 f f t f s 1 1184 "0"  timestamptz_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1151 (  timestamptz_out  PGNSP PGUID 12 f f f t f s 1 23 "0" 100 0 0 100	timestamptz_out - _null_ ));
+DATA(insert OID = 1151 (  timestamptz_out  PGNSP PGUID 12 f f t f s 1 23 "0"	timestamptz_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1152 (  timestamptz_eq   PGNSP PGUID 12 f f f t f i 2 16 "1184 1184" 100 0 0 100	timestamp_eq - _null_ ));
+DATA(insert OID = 1152 (  timestamptz_eq   PGNSP PGUID 12 f f t f i 2 16 "1184 1184"	timestamp_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1153 (  timestamptz_ne   PGNSP PGUID 12 f f f t f i 2 16 "1184 1184" 100 0 0 100	timestamp_ne - _null_ ));
+DATA(insert OID = 1153 (  timestamptz_ne   PGNSP PGUID 12 f f t f i 2 16 "1184 1184"	timestamp_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1154 (  timestamptz_lt   PGNSP PGUID 12 f f f t f i 2 16 "1184 1184" 100 0 0 100	timestamp_lt - _null_ ));
+DATA(insert OID = 1154 (  timestamptz_lt   PGNSP PGUID 12 f f t f i 2 16 "1184 1184"	timestamp_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1155 (  timestamptz_le   PGNSP PGUID 12 f f f t f i 2 16 "1184 1184" 100 0 0 100	timestamp_le - _null_ ));
+DATA(insert OID = 1155 (  timestamptz_le   PGNSP PGUID 12 f f t f i 2 16 "1184 1184"	timestamp_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1156 (  timestamptz_ge   PGNSP PGUID 12 f f f t f i 2 16 "1184 1184" 100 0 0 100	timestamp_ge - _null_ ));
+DATA(insert OID = 1156 (  timestamptz_ge   PGNSP PGUID 12 f f t f i 2 16 "1184 1184"	timestamp_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1157 (  timestamptz_gt   PGNSP PGUID 12 f f f t f i 2 16 "1184 1184" 100 0 0 100	timestamp_gt - _null_ ));
+DATA(insert OID = 1157 (  timestamptz_gt   PGNSP PGUID 12 f f t f i 2 16 "1184 1184"	timestamp_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1159 (  timezone		   PGNSP PGUID 12 f f f t f s 2 1114 "25 1184" 100 0 0 100  timestamptz_zone - _null_ ));
+DATA(insert OID = 1159 (  timezone		   PGNSP PGUID 12 f f t f s 2 1114 "25 1184"  timestamptz_zone - _null_ ));
 DESCR("timestamp at a specified time zone");
 
-DATA(insert OID = 1160 (  interval_in	   PGNSP PGUID 12 f f f t f s 1 1186 "0" 100 0 0 100  interval_in - _null_ ));
+DATA(insert OID = 1160 (  interval_in	   PGNSP PGUID 12 f f t f s 1 1186 "0"  interval_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1161 (  interval_out	   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	interval_out - _null_ ));
+DATA(insert OID = 1161 (  interval_out	   PGNSP PGUID 12 f f t f i 1 23 "0"	interval_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1162 (  interval_eq	   PGNSP PGUID 12 f f f t f i 2 16 "1186 1186" 100 0 0 100	interval_eq - _null_ ));
+DATA(insert OID = 1162 (  interval_eq	   PGNSP PGUID 12 f f t f i 2 16 "1186 1186"	interval_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1163 (  interval_ne	   PGNSP PGUID 12 f f f t f i 2 16 "1186 1186" 100 0 0 100	interval_ne - _null_ ));
+DATA(insert OID = 1163 (  interval_ne	   PGNSP PGUID 12 f f t f i 2 16 "1186 1186"	interval_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1164 (  interval_lt	   PGNSP PGUID 12 f f f t f i 2 16 "1186 1186" 100 0 0 100	interval_lt - _null_ ));
+DATA(insert OID = 1164 (  interval_lt	   PGNSP PGUID 12 f f t f i 2 16 "1186 1186"	interval_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1165 (  interval_le	   PGNSP PGUID 12 f f f t f i 2 16 "1186 1186" 100 0 0 100	interval_le - _null_ ));
+DATA(insert OID = 1165 (  interval_le	   PGNSP PGUID 12 f f t f i 2 16 "1186 1186"	interval_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1166 (  interval_ge	   PGNSP PGUID 12 f f f t f i 2 16 "1186 1186" 100 0 0 100	interval_ge - _null_ ));
+DATA(insert OID = 1166 (  interval_ge	   PGNSP PGUID 12 f f t f i 2 16 "1186 1186"	interval_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1167 (  interval_gt	   PGNSP PGUID 12 f f f t f i 2 16 "1186 1186" 100 0 0 100	interval_gt - _null_ ));
+DATA(insert OID = 1167 (  interval_gt	   PGNSP PGUID 12 f f t f i 2 16 "1186 1186"	interval_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1168 (  interval_um	   PGNSP PGUID 12 f f f t f i 1 1186 "1186" 100 0 0 100  interval_um - _null_ ));
+DATA(insert OID = 1168 (  interval_um	   PGNSP PGUID 12 f f t f i 1 1186 "1186"  interval_um - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1169 (  interval_pl	   PGNSP PGUID 12 f f f t f i 2 1186 "1186 1186" 100 0 0 100  interval_pl - _null_ ));
+DATA(insert OID = 1169 (  interval_pl	   PGNSP PGUID 12 f f t f i 2 1186 "1186 1186"  interval_pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 1170 (  interval_mi	   PGNSP PGUID 12 f f f t f i 2 1186 "1186 1186" 100 0 0 100  interval_mi - _null_ ));
+DATA(insert OID = 1170 (  interval_mi	   PGNSP PGUID 12 f f t f i 2 1186 "1186 1186"  interval_mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1171 (  date_part		   PGNSP PGUID 12 f f f t f s 2  701 "25 1184" 100 0 0 100	timestamptz_part - _null_ ));
+DATA(insert OID = 1171 (  date_part		   PGNSP PGUID 12 f f t f s 2  701 "25 1184"	timestamptz_part - _null_ ));
 DESCR("extract field from timestamp with time zone");
-DATA(insert OID = 1172 (  date_part		   PGNSP PGUID 12 f f f t f i 2  701 "25 1186" 100 0 0 100	interval_part - _null_ ));
+DATA(insert OID = 1172 (  date_part		   PGNSP PGUID 12 f f t f i 2  701 "25 1186"	interval_part - _null_ ));
 DESCR("extract field from interval");
-DATA(insert OID = 1173 (  timestamptz	   PGNSP PGUID 12 f f t t f s 1 1184 "702" 100 0 0 100	abstime_timestamptz - _null_ ));
+DATA(insert OID = 1173 (  timestamptz	   PGNSP PGUID 12 f f t f s 1 1184 "702"	abstime_timestamptz - _null_ ));
 DESCR("convert abstime to timestamp with time zone");
-DATA(insert OID = 1174 (  timestamptz	   PGNSP PGUID 12 f f t t f s 1 1184 "1082" 100 0 0 100  date_timestamptz - _null_ ));
+DATA(insert OID = 1174 (  timestamptz	   PGNSP PGUID 12 f f t f s 1 1184 "1082"  date_timestamptz - _null_ ));
 DESCR("convert date to timestamp with time zone");
-DATA(insert OID = 1176 (  timestamptz	   PGNSP PGUID 14 f f f t f s 2 1184 "1082 1083" 100 0 0 100  "select timestamptz($1 + $2)" - _null_ ));
+DATA(insert OID = 1176 (  timestamptz	   PGNSP PGUID 14 f f t f s 2 1184 "1082 1083"  "select timestamptz($1 + $2)" - _null_ ));
 DESCR("convert date and time to timestamp with time zone");
-DATA(insert OID = 1177 (  interval		   PGNSP PGUID 12 f f t t f i 1 1186 "703" 100 0 0 100	reltime_interval - _null_ ));
+DATA(insert OID = 1177 (  interval		   PGNSP PGUID 12 f f t f i 1 1186 "703"	reltime_interval - _null_ ));
 DESCR("convert reltime to interval");
-DATA(insert OID = 1178 (  date			   PGNSP PGUID 12 f f f t f s 1 1082 "1184" 100 0 0 100  timestamptz_date - _null_ ));
+DATA(insert OID = 1178 (  date			   PGNSP PGUID 12 f f t f s 1 1082 "1184"  timestamptz_date - _null_ ));
 DESCR("convert timestamp with time zone to date");
-DATA(insert OID = 1179 (  date			   PGNSP PGUID 12 f f f t f s 1 1082 "702" 100 0 0 100	abstime_date - _null_ ));
+DATA(insert OID = 1179 (  date			   PGNSP PGUID 12 f f t f s 1 1082 "702"	abstime_date - _null_ ));
 DESCR("convert abstime to date");
-DATA(insert OID = 1180 (  abstime		   PGNSP PGUID 12 f f f t f s 1  702 "1184" 100 0 0 100  timestamptz_abstime - _null_ ));
+DATA(insert OID = 1180 (  abstime		   PGNSP PGUID 12 f f t f s 1  702 "1184"  timestamptz_abstime - _null_ ));
 DESCR("convert timestamp with time zone to abstime");
-DATA(insert OID = 1181 (  age			   PGNSP PGUID 12 f f f t f s 1 23 "28" 100 0 0 100  xid_age - _null_ ));
+DATA(insert OID = 1181 (  age			   PGNSP PGUID 12 f f t f s 1 23 "28"  xid_age - _null_ ));
 DESCR("age of a transaction ID, in transactions before current transaction");
 
-DATA(insert OID = 1188 (  timestamptz_mi   PGNSP PGUID 12 f f f t f i 2 1186 "1184 1184" 100 0 0 100  timestamp_mi - _null_ ));
+DATA(insert OID = 1188 (  timestamptz_mi   PGNSP PGUID 12 f f t f i 2 1186 "1184 1184"  timestamp_mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1189 (  timestamptz_pl_span PGNSP PGUID 12 f f f t f i 2 1184 "1184 1186" 100 0 0 100  timestamptz_pl_span - _null_ ));
+DATA(insert OID = 1189 (  timestamptz_pl_span PGNSP PGUID 12 f f t f i 2 1184 "1184 1186"  timestamptz_pl_span - _null_ ));
 DESCR("plus");
-DATA(insert OID = 1190 (  timestamptz_mi_span PGNSP PGUID 12 f f f t f i 2 1184 "1184 1186" 100 0 0 100  timestamptz_mi_span - _null_ ));
+DATA(insert OID = 1190 (  timestamptz_mi_span PGNSP PGUID 12 f f t f i 2 1184 "1184 1186"  timestamptz_mi_span - _null_ ));
 DESCR("minus");
-DATA(insert OID = 1191 (  timestamptz		PGNSP PGUID 12 f f f t f s 1 1184 "25" 100 0 0 100	text_timestamptz - _null_ ));
+DATA(insert OID = 1191 (  timestamptz		PGNSP PGUID 12 f f t f s 1 1184 "25"	text_timestamptz - _null_ ));
 DESCR("convert text to timestamp with time zone");
-DATA(insert OID = 1192 (  text				PGNSP PGUID 12 f f t t f s 1	 25 "1184" 100 0 0 100	timestamptz_text - _null_ ));
+DATA(insert OID = 1192 (  text				PGNSP PGUID 12 f f t f s 1	 25 "1184"	timestamptz_text - _null_ ));
 DESCR("convert timestamp to text");
-DATA(insert OID = 1193 (  text				PGNSP PGUID 12 f f t t f i 1	 25 "1186" 100 0 0 100	interval_text - _null_ ));
+DATA(insert OID = 1193 (  text				PGNSP PGUID 12 f f t f i 1	 25 "1186"	interval_text - _null_ ));
 DESCR("convert interval to text");
-DATA(insert OID = 1194 (  reltime			PGNSP PGUID 12 f f f t f i 1	703 "1186" 100 0 0 100	interval_reltime - _null_ ));
+DATA(insert OID = 1194 (  reltime			PGNSP PGUID 12 f f t f i 1	703 "1186"	interval_reltime - _null_ ));
 DESCR("convert interval to reltime");
-DATA(insert OID = 1195 (  timestamptz_smaller PGNSP PGUID 12 f f f t f i 2 1184 "1184 1184" 100 0 0 100  timestamp_smaller - _null_ ));
+DATA(insert OID = 1195 (  timestamptz_smaller PGNSP PGUID 12 f f t f i 2 1184 "1184 1184"  timestamp_smaller - _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 1196 (  timestamptz_larger  PGNSP PGUID 12 f f f t f i 2 1184 "1184 1184" 100 0 0 100  timestamp_larger - _null_ ));
+DATA(insert OID = 1196 (  timestamptz_larger  PGNSP PGUID 12 f f t f i 2 1184 "1184 1184"  timestamp_larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1197 (  interval_smaller	PGNSP PGUID 12 f f f t f i 2 1186 "1186 1186" 100 0 0 100  interval_smaller - _null_ ));
+DATA(insert OID = 1197 (  interval_smaller	PGNSP PGUID 12 f f t f i 2 1186 "1186 1186"  interval_smaller - _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 1198 (  interval_larger	PGNSP PGUID 12 f f f t f i 2 1186 "1186 1186" 100 0 0 100  interval_larger - _null_ ));
+DATA(insert OID = 1198 (  interval_larger	PGNSP PGUID 12 f f t f i 2 1186 "1186 1186"  interval_larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1199 (  age				PGNSP PGUID 12 f f f t f i 2 1186 "1184 1184" 100 0 0 100  timestamptz_age - _null_ ));
+DATA(insert OID = 1199 (  age				PGNSP PGUID 12 f f t f i 2 1186 "1184 1184"  timestamptz_age - _null_ ));
 DESCR("date difference preserving months and years");
 
 /* OIDS 1200 - 1299 */
 
-DATA(insert OID = 1200 (  reltime		   PGNSP PGUID 12 f f f t f i 1  703 "23" 100 0 0 100  int4reltime - _null_ ));
+DATA(insert OID = 1200 (  reltime		   PGNSP PGUID 12 f f t f i 1  703 "23"  int4reltime - _null_ ));
 DESCR("convert int4 to reltime");
 
-DATA(insert OID = 1215 (  obj_description	PGNSP PGUID 14 f f f t f s 2	25 "26 19" 100 0 0 100	"select description from pg_description where objoid = $1 and classoid = (select oid from pg_class where relname = $2 and relnamespace = PGNSP) and objsubid = 0" - _null_ ));
+DATA(insert OID = 1215 (  obj_description	PGNSP PGUID 14 f f t f s 2	25 "26 19"	"select description from pg_description where objoid = $1 and classoid = (select oid from pg_class where relname = $2 and relnamespace = PGNSP) and objsubid = 0" - _null_ ));
 DESCR("get description for object id and catalog name");
-DATA(insert OID = 1216 (  col_description	PGNSP PGUID 14 f f f t f s 2	25 "26 23" 100 0 0 100	"select description from pg_description where objoid = $1 and classoid = \'pg_catalog.pg_class\'::regclass and objsubid = $2" - _null_ ));
+DATA(insert OID = 1216 (  col_description	PGNSP PGUID 14 f f t f s 2	25 "26 23"	"select description from pg_description where objoid = $1 and classoid = \'pg_catalog.pg_class\'::regclass and objsubid = $2" - _null_ ));
 DESCR("get description for table column");
 
-DATA(insert OID = 1217 (  date_trunc	   PGNSP PGUID 12 f f f t f i 2 1184 "25 1184" 100 0 0 100	timestamptz_trunc - _null_ ));
+DATA(insert OID = 1217 (  date_trunc	   PGNSP PGUID 12 f f t f i 2 1184 "25 1184"	timestamptz_trunc - _null_ ));
 DESCR("truncate timestamp with time zone to specified units");
-DATA(insert OID = 1218 (  date_trunc	   PGNSP PGUID 12 f f f t f i 2 1186 "25 1186" 100 0 0 100	interval_trunc - _null_ ));
+DATA(insert OID = 1218 (  date_trunc	   PGNSP PGUID 12 f f t f i 2 1186 "25 1186"	interval_trunc - _null_ ));
 DESCR("truncate interval to specified units");
 
-DATA(insert OID = 1219 (  int8inc		   PGNSP PGUID 12 f f f t f i 1 20 "20" 100 0 0 100  int8inc - _null_ ));
+DATA(insert OID = 1219 (  int8inc		   PGNSP PGUID 12 f f t f i 1 20 "20"  int8inc - _null_ ));
 DESCR("increment");
-DATA(insert OID = 1230 (  int8abs		   PGNSP PGUID 12 f f f t f i 1 20 "20" 100 0 0 100  int8abs - _null_ ));
+DATA(insert OID = 1230 (  int8abs		   PGNSP PGUID 12 f f t f i 1 20 "20"  int8abs - _null_ ));
 DESCR("absolute value");
 
-DATA(insert OID = 1236 (  int8larger	   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8larger - _null_ ));
+DATA(insert OID = 1236 (  int8larger	   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1237 (  int8smaller	   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8smaller - _null_ ));
+DATA(insert OID = 1237 (  int8smaller	   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8smaller - _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 1238 (  texticregexeq    PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	texticregexeq - _null_ ));
+DATA(insert OID = 1238 (  texticregexeq    PGNSP PGUID 12 f f t f i 2 16 "25 25"	texticregexeq - _null_ ));
 DESCR("matches regex., case-insensitive");
-DATA(insert OID = 1239 (  texticregexne    PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100	texticregexne - _null_ ));
+DATA(insert OID = 1239 (  texticregexne    PGNSP PGUID 12 f f t f i 2 16 "25 25"	texticregexne - _null_ ));
 DESCR("does not match regex., case-insensitive");
-DATA(insert OID = 1240 (  nameicregexeq    PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100	nameicregexeq - _null_ ));
+DATA(insert OID = 1240 (  nameicregexeq    PGNSP PGUID 12 f f t f i 2 16 "19 25"	nameicregexeq - _null_ ));
 DESCR("matches regex., case-insensitive");
-DATA(insert OID = 1241 (  nameicregexne    PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100	nameicregexne - _null_ ));
+DATA(insert OID = 1241 (  nameicregexne    PGNSP PGUID 12 f f t f i 2 16 "19 25"	nameicregexne - _null_ ));
 DESCR("does not match regex., case-insensitive");
 
-DATA(insert OID = 1251 (  int4abs		   PGNSP PGUID 12 f f f t f i 1 23 "23" 100 0 0 100  int4abs - _null_ ));
+DATA(insert OID = 1251 (  int4abs		   PGNSP PGUID 12 f f t f i 1 23 "23"  int4abs - _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1253 (  int2abs		   PGNSP PGUID 12 f f f t f i 1 21 "21" 100 0 0 100  int2abs - _null_ ));
+DATA(insert OID = 1253 (  int2abs		   PGNSP PGUID 12 f f t f i 1 21 "21"  int2abs - _null_ ));
 DESCR("absolute value");
 
-DATA(insert OID = 1263 (  interval		   PGNSP PGUID 12 f f f t f s 1 1186 "25" 100 0 0 100  text_interval - _null_ ));
+DATA(insert OID = 1263 (  interval		   PGNSP PGUID 12 f f t f s 1 1186 "25"  text_interval - _null_ ));
 DESCR("convert text to interval");
 
-DATA(insert OID = 1271 (  overlaps		   PGNSP PGUID 12 f f f f f i 4 16 "1266 1266 1266 1266" 100 0 0 100  overlaps_timetz - _null_ ));
+DATA(insert OID = 1271 (  overlaps		   PGNSP PGUID 12 f f f f i 4 16 "1266 1266 1266 1266"  overlaps_timetz - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 1272 (  datetime_pl	   PGNSP PGUID 12 f f f t f i 2 1114 "1082 1083" 100 0 0 100  datetime_timestamp - _null_ ));
+DATA(insert OID = 1272 (  datetime_pl	   PGNSP PGUID 12 f f t f i 2 1114 "1082 1083"  datetime_timestamp - _null_ ));
 DESCR("convert date and time to timestamp");
-DATA(insert OID = 1273 (  date_part		   PGNSP PGUID 12 f f f t f i 2  701 "25 1266" 100 0 0 100	timetz_part - _null_ ));
+DATA(insert OID = 1273 (  date_part		   PGNSP PGUID 12 f f t f i 2  701 "25 1266"	timetz_part - _null_ ));
 DESCR("extract field from time with time zone");
-DATA(insert OID = 1274 (  int84pl		   PGNSP PGUID 12 f f f t f i 2 20 "20 23" 100 0 0 100	int84pl - _null_ ));
+DATA(insert OID = 1274 (  int84pl		   PGNSP PGUID 12 f f t f i 2 20 "20 23"	int84pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 1275 (  int84mi		   PGNSP PGUID 12 f f f t f i 2 20 "20 23" 100 0 0 100	int84mi - _null_ ));
+DATA(insert OID = 1275 (  int84mi		   PGNSP PGUID 12 f f t f i 2 20 "20 23"	int84mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1276 (  int84mul		   PGNSP PGUID 12 f f f t f i 2 20 "20 23" 100 0 0 100	int84mul - _null_ ));
+DATA(insert OID = 1276 (  int84mul		   PGNSP PGUID 12 f f t f i 2 20 "20 23"	int84mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 1277 (  int84div		   PGNSP PGUID 12 f f f t f i 2 20 "20 23" 100 0 0 100	int84div - _null_ ));
+DATA(insert OID = 1277 (  int84div		   PGNSP PGUID 12 f f t f i 2 20 "20 23"	int84div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 1278 (  int48pl		   PGNSP PGUID 12 f f f t f i 2 20 "23 20" 100 0 0 100	int48pl - _null_ ));
+DATA(insert OID = 1278 (  int48pl		   PGNSP PGUID 12 f f t f i 2 20 "23 20"	int48pl - _null_ ));
 DESCR("add");
-DATA(insert OID = 1279 (  int48mi		   PGNSP PGUID 12 f f f t f i 2 20 "23 20" 100 0 0 100	int48mi - _null_ ));
+DATA(insert OID = 1279 (  int48mi		   PGNSP PGUID 12 f f t f i 2 20 "23 20"	int48mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1280 (  int48mul		   PGNSP PGUID 12 f f f t f i 2 20 "23 20" 100 0 0 100	int48mul - _null_ ));
+DATA(insert OID = 1280 (  int48mul		   PGNSP PGUID 12 f f t f i 2 20 "23 20"	int48mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 1281 (  int48div		   PGNSP PGUID 12 f f f t f i 2 20 "23 20" 100 0 0 100	int48div - _null_ ));
+DATA(insert OID = 1281 (  int48div		   PGNSP PGUID 12 f f t f i 2 20 "23 20"	int48div - _null_ ));
 DESCR("divide");
 
-DATA(insert OID = 1288 (  text			   PGNSP PGUID 12 f f t t f i 1 25 "20" 100 0 0 100  int8_text - _null_ ));
+DATA(insert OID = 1288 (  text			   PGNSP PGUID 12 f f t f i 1 25 "20"  int8_text - _null_ ));
 DESCR("convert int8 to text");
-DATA(insert OID = 1289 (  int8			   PGNSP PGUID 12 f f f t f i 1 20 "25" 100 0 0 100  text_int8 - _null_ ));
+DATA(insert OID = 1289 (  int8			   PGNSP PGUID 12 f f t f i 1 20 "25"  text_int8 - _null_ ));
 DESCR("convert text to int8");
 
-DATA(insert OID = 1290 (  _bpchar		   PGNSP PGUID 12 f f t t f i 2 1014 "1014 23" 100 0 0 100	_bpchar - _null_ ));
+DATA(insert OID = 1290 (  _bpchar		   PGNSP PGUID 12 f f t f i 2 1014 "1014 23"	_bpchar - _null_ ));
 DESCR("adjust char()[] to typmod length");
-DATA(insert OID = 1291 (  _varchar		   PGNSP PGUID 12 f f t t f i 2 1015 "1015 23" 100 0 0 100	_varchar - _null_ ));
+DATA(insert OID = 1291 (  _varchar		   PGNSP PGUID 12 f f t f i 2 1015 "1015 23"	_varchar - _null_ ));
 DESCR("adjust varchar()[] to typmod length");
 
-DATA(insert OID = 1292 ( tideq			   PGNSP PGUID 12 f f f t f i 2 16 "27 27" 100 0 0 100	tideq - _null_ ));
+DATA(insert OID = 1292 ( tideq			   PGNSP PGUID 12 f f t f i 2 16 "27 27"	tideq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1293 ( currtid		   PGNSP PGUID 12 f f f t f v 2 27 "26 27" 100 0 0 100	currtid_byreloid - _null_ ));
+DATA(insert OID = 1293 ( currtid		   PGNSP PGUID 12 f f t f v 2 27 "26 27"	currtid_byreloid - _null_ ));
 DESCR("latest tid of a tuple");
-DATA(insert OID = 1294 ( currtid2		   PGNSP PGUID 12 f f f t f v 2 27 "25 27" 100 0 0 100	currtid_byrelname - _null_ ));
+DATA(insert OID = 1294 ( currtid2		   PGNSP PGUID 12 f f t f v 2 27 "25 27"	currtid_byrelname - _null_ ));
 DESCR("latest tid of a tuple");
 
-DATA(insert OID = 1296 (  timedate_pl	   PGNSP PGUID 14 f f f t f i 2 1114 "1083 1082" 100 0 0 100  "select ($2 + $1)" - _null_ ));
+DATA(insert OID = 1296 (  timedate_pl	   PGNSP PGUID 14 f f t f i 2 1114 "1083 1082"  "select ($2 + $1)" - _null_ ));
 DESCR("convert time and date to timestamp");
-DATA(insert OID = 1297 (  datetimetz_pl    PGNSP PGUID 12 f f f t f i 2 1184 "1082 1266" 100 0 0 100  datetimetz_timestamptz - _null_ ));
+DATA(insert OID = 1297 (  datetimetz_pl    PGNSP PGUID 12 f f t f i 2 1184 "1082 1266"  datetimetz_timestamptz - _null_ ));
 DESCR("convert date and time with time zone to timestamp with time zone");
-DATA(insert OID = 1298 (  timetzdate_pl    PGNSP PGUID 14 f f f t f i 2 1184 "1266 1082" 100 0 0 100  "select ($2 + $1)" - _null_ ));
+DATA(insert OID = 1298 (  timetzdate_pl    PGNSP PGUID 14 f f t f i 2 1184 "1266 1082"  "select ($2 + $1)" - _null_ ));
 DESCR("convert time with time zone and date to timestamp");
-DATA(insert OID = 1299 (  now			   PGNSP PGUID 12 f f f t f s 0 1184 "0" 100 0 0 100  now - _null_ ));
+DATA(insert OID = 1299 (  now			   PGNSP PGUID 12 f f t f s 0 1184 "0"  now - _null_ ));
 DESCR("current transaction time");
 
 /* OIDS 1300 - 1399 */
 
-DATA(insert OID = 1300 (  positionsel		   PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  positionsel - _null_ ));
+DATA(insert OID = 1300 (  positionsel		   PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  positionsel - _null_ ));
 DESCR("restriction selectivity for position-comparison operators");
-DATA(insert OID = 1301 (  positionjoinsel	   PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  positionjoinsel - _null_ ));
+DATA(insert OID = 1301 (  positionjoinsel	   PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  positionjoinsel - _null_ ));
 DESCR("join selectivity for position-comparison operators");
-DATA(insert OID = 1302 (  contsel		   PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  contsel - _null_ ));
+DATA(insert OID = 1302 (  contsel		   PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  contsel - _null_ ));
 DESCR("restriction selectivity for containment comparison operators");
-DATA(insert OID = 1303 (  contjoinsel	   PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  contjoinsel - _null_ ));
+DATA(insert OID = 1303 (  contjoinsel	   PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  contjoinsel - _null_ ));
 DESCR("join selectivity for containment comparison operators");
 
-DATA(insert OID = 1304 ( overlaps			 PGNSP PGUID 12 f f f f f i 4 16 "1184 1184 1184 1184" 100 0 0 100	overlaps_timestamp - _null_ ));
+DATA(insert OID = 1304 ( overlaps			 PGNSP PGUID 12 f f f f i 4 16 "1184 1184 1184 1184"	overlaps_timestamp - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 1305 ( overlaps			 PGNSP PGUID 14 f f f f f i 4 16 "1184 1186 1184 1186" 100 0 0 100	"select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ ));
+DATA(insert OID = 1305 ( overlaps			 PGNSP PGUID 14 f f f f i 4 16 "1184 1186 1184 1186"	"select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 1306 ( overlaps			 PGNSP PGUID 14 f f f f f i 4 16 "1184 1184 1184 1186" 100 0 0 100	"select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ ));
+DATA(insert OID = 1306 ( overlaps			 PGNSP PGUID 14 f f f f i 4 16 "1184 1184 1184 1186"	"select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 1307 ( overlaps			 PGNSP PGUID 14 f f f f f i 4 16 "1184 1186 1184 1184" 100 0 0 100	"select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ ));
+DATA(insert OID = 1307 ( overlaps			 PGNSP PGUID 14 f f f f i 4 16 "1184 1186 1184 1184"	"select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ ));
 DESCR("SQL92 interval comparison");
 
-DATA(insert OID = 1308 ( overlaps			 PGNSP PGUID 12 f f f f f i 4 16 "1083 1083 1083 1083" 100 0 0 100	overlaps_time - _null_ ));
+DATA(insert OID = 1308 ( overlaps			 PGNSP PGUID 12 f f f f i 4 16 "1083 1083 1083 1083"	overlaps_time - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 1309 ( overlaps			 PGNSP PGUID 14 f f f f f i 4 16 "1083 1186 1083 1186" 100 0 0 100	"select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ ));
+DATA(insert OID = 1309 ( overlaps			 PGNSP PGUID 14 f f f f i 4 16 "1083 1186 1083 1186"	"select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 1310 ( overlaps			 PGNSP PGUID 14 f f f f f i 4 16 "1083 1083 1083 1186" 100 0 0 100	"select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ ));
+DATA(insert OID = 1310 ( overlaps			 PGNSP PGUID 14 f f f f i 4 16 "1083 1083 1083 1186"	"select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 1311 ( overlaps			 PGNSP PGUID 14 f f f f f i 4 16 "1083 1186 1083 1083" 100 0 0 100	"select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ ));
+DATA(insert OID = 1311 ( overlaps			 PGNSP PGUID 14 f f f f i 4 16 "1083 1186 1083 1083"	"select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ ));
 DESCR("SQL92 interval comparison");
 
-DATA(insert OID = 1312 (  timestamp_in		 PGNSP PGUID 12 f f f t f s 1 1114 "0" 100 0 0 100	timestamp_in - _null_ ));
+DATA(insert OID = 1312 (  timestamp_in		 PGNSP PGUID 12 f f t f s 1 1114 "0"	timestamp_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1313 (  timestamp_out		 PGNSP PGUID 12 f f f t f s 1 23 "0" 100 0 0 100  timestamp_out - _null_ ));
+DATA(insert OID = 1313 (  timestamp_out		 PGNSP PGUID 12 f f t f s 1 23 "0"  timestamp_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1314 (  timestamptz_cmp	 PGNSP PGUID 12 f f f t f i 2	23 "1184 1184" 100 0 0 100	timestamp_cmp - _null_ ));
+DATA(insert OID = 1314 (  timestamptz_cmp	 PGNSP PGUID 12 f f t f i 2	23 "1184 1184"	timestamp_cmp - _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1315 (  interval_cmp		 PGNSP PGUID 12 f f f t f i 2	23 "1186 1186" 100 0 0 100	interval_cmp - _null_ ));
+DATA(insert OID = 1315 (  interval_cmp		 PGNSP PGUID 12 f f t f i 2	23 "1186 1186"	interval_cmp - _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1316 (  time				 PGNSP PGUID 12 f f f t f i 1 1083 "1114" 100 0 0 100  timestamp_time - _null_ ));
+DATA(insert OID = 1316 (  time				 PGNSP PGUID 12 f f t f i 1 1083 "1114"  timestamp_time - _null_ ));
 DESCR("convert timestamp to time");
 
-DATA(insert OID = 1317 (  length			 PGNSP PGUID 12 f f f t f i 1	23 "25" 100 0 0 100  textlen - _null_ ));
+DATA(insert OID = 1317 (  length			 PGNSP PGUID 12 f f t f i 1	23 "25"  textlen - _null_ ));
 DESCR("length");
-DATA(insert OID = 1318 (  length			 PGNSP PGUID 12 f f f t f i 1	23 "1042" 100 0 0 100  bpcharlen - _null_ ));
+DATA(insert OID = 1318 (  length			 PGNSP PGUID 12 f f t f i 1	23 "1042"  bpcharlen - _null_ ));
 DESCR("character length");
-DATA(insert OID = 1319 (  length			 PGNSP PGUID 12 f f f t f i 1	23 "1043" 100 0 0 100  varcharlen - _null_ ));
+DATA(insert OID = 1319 (  length			 PGNSP PGUID 12 f f t f i 1	23 "1043"  varcharlen - _null_ ));
 DESCR("character length");
 
-DATA(insert OID = 1326 (  interval_div		 PGNSP PGUID 12 f f f t f i 2 1186 "1186 701" 100 0 0 100  interval_div - _null_ ));
+DATA(insert OID = 1326 (  interval_div		 PGNSP PGUID 12 f f t f i 2 1186 "1186 701"  interval_div - _null_ ));
 DESCR("divide");
 
-DATA(insert OID = 1339 (  dlog10			 PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dlog10 - _null_ ));
+DATA(insert OID = 1339 (  dlog10			 PGNSP PGUID 12 f f t f i 1 701 "701"  dlog10 - _null_ ));
 DESCR("base 10 logarithm");
-DATA(insert OID = 1340 (  log				 PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dlog10 - _null_ ));
+DATA(insert OID = 1340 (  log				 PGNSP PGUID 12 f f t f i 1 701 "701"  dlog10 - _null_ ));
 DESCR("base 10 logarithm");
-DATA(insert OID = 1341 (  ln				 PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dlog1 - _null_ ));
+DATA(insert OID = 1341 (  ln				 PGNSP PGUID 12 f f t f i 1 701 "701"  dlog1 - _null_ ));
 DESCR("natural logarithm");
-DATA(insert OID = 1342 (  round				 PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dround - _null_ ));
+DATA(insert OID = 1342 (  round				 PGNSP PGUID 12 f f t f i 1 701 "701"  dround - _null_ ));
 DESCR("round to nearest integer");
-DATA(insert OID = 1343 (  trunc				 PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dtrunc - _null_ ));
+DATA(insert OID = 1343 (  trunc				 PGNSP PGUID 12 f f t f i 1 701 "701"  dtrunc - _null_ ));
 DESCR("truncate to integer");
-DATA(insert OID = 1344 (  sqrt				 PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dsqrt - _null_ ));
+DATA(insert OID = 1344 (  sqrt				 PGNSP PGUID 12 f f t f i 1 701 "701"  dsqrt - _null_ ));
 DESCR("square root");
-DATA(insert OID = 1345 (  cbrt				 PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dcbrt - _null_ ));
+DATA(insert OID = 1345 (  cbrt				 PGNSP PGUID 12 f f t f i 1 701 "701"  dcbrt - _null_ ));
 DESCR("cube root");
-DATA(insert OID = 1346 (  pow				 PGNSP PGUID 12 f f f t f i 2 701 "701 701" 100 0 0 100  dpow - _null_ ));
+DATA(insert OID = 1346 (  pow				 PGNSP PGUID 12 f f t f i 2 701 "701 701"  dpow - _null_ ));
 DESCR("exponentiation");
-DATA(insert OID = 1347 (  exp				 PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  dexp - _null_ ));
+DATA(insert OID = 1347 (  exp				 PGNSP PGUID 12 f f t f i 1 701 "701"  dexp - _null_ ));
 DESCR("exponential");
 
 /*
  * This form of obj_description is now deprecated, since it will fail if
  * OIDs are not unique across system catalogs.	Use the other forms instead.
  */
-DATA(insert OID = 1348 (  obj_description	 PGNSP PGUID 14 f f f t f s 1	25 "26" 100 0 0 100  "select description from pg_description where objoid = $1 and objsubid = 0" - _null_ ));
+DATA(insert OID = 1348 (  obj_description	 PGNSP PGUID 14 f f t f s 1	25 "26"  "select description from pg_description where objoid = $1 and objsubid = 0" - _null_ ));
 DESCR("get description for object id (deprecated)");
-DATA(insert OID = 1349 (  oidvectortypes	 PGNSP PGUID 12 f f f t f s 1	25 "30" 100 0 0 100  oidvectortypes - _null_ ));
+DATA(insert OID = 1349 (  oidvectortypes	 PGNSP PGUID 12 f f t f s 1	25 "30"  oidvectortypes - _null_ ));
 DESCR("print type names of oidvector field");
 
 
-DATA(insert OID = 1350 (  timetz_in		   PGNSP PGUID 12 f f f t f s 1 1266 "0" 100 0 0 100  timetz_in - _null_ ));
+DATA(insert OID = 1350 (  timetz_in		   PGNSP PGUID 12 f f t f s 1 1266 "0"  timetz_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1351 (  timetz_out	   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	timetz_out - _null_ ));
+DATA(insert OID = 1351 (  timetz_out	   PGNSP PGUID 12 f f t f i 1 23 "0"	timetz_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1352 (  timetz_eq		   PGNSP PGUID 12 f f f t f i 2 16 "1266 1266" 100 0 0 100	timetz_eq - _null_ ));
+DATA(insert OID = 1352 (  timetz_eq		   PGNSP PGUID 12 f f t f i 2 16 "1266 1266"	timetz_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1353 (  timetz_ne		   PGNSP PGUID 12 f f f t f i 2 16 "1266 1266" 100 0 0 100	timetz_ne - _null_ ));
+DATA(insert OID = 1353 (  timetz_ne		   PGNSP PGUID 12 f f t f i 2 16 "1266 1266"	timetz_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1354 (  timetz_lt		   PGNSP PGUID 12 f f f t f i 2 16 "1266 1266" 100 0 0 100	timetz_lt - _null_ ));
+DATA(insert OID = 1354 (  timetz_lt		   PGNSP PGUID 12 f f t f i 2 16 "1266 1266"	timetz_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1355 (  timetz_le		   PGNSP PGUID 12 f f f t f i 2 16 "1266 1266" 100 0 0 100	timetz_le - _null_ ));
+DATA(insert OID = 1355 (  timetz_le		   PGNSP PGUID 12 f f t f i 2 16 "1266 1266"	timetz_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1356 (  timetz_ge		   PGNSP PGUID 12 f f f t f i 2 16 "1266 1266" 100 0 0 100	timetz_ge - _null_ ));
+DATA(insert OID = 1356 (  timetz_ge		   PGNSP PGUID 12 f f t f i 2 16 "1266 1266"	timetz_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1357 (  timetz_gt		   PGNSP PGUID 12 f f f t f i 2 16 "1266 1266" 100 0 0 100	timetz_gt - _null_ ));
+DATA(insert OID = 1357 (  timetz_gt		   PGNSP PGUID 12 f f t f i 2 16 "1266 1266"	timetz_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1358 (  timetz_cmp	   PGNSP PGUID 12 f f f t f i 2 23 "1266 1266" 100 0 0 100	timetz_cmp - _null_ ));
+DATA(insert OID = 1358 (  timetz_cmp	   PGNSP PGUID 12 f f t f i 2 23 "1266 1266"	timetz_cmp - _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1359 (  timestamptz	   PGNSP PGUID 12 f f f t f i 2 1184 "1082 1266" 100 0 0 100  datetimetz_timestamptz - _null_ ));
+DATA(insert OID = 1359 (  timestamptz	   PGNSP PGUID 12 f f t f i 2 1184 "1082 1266"  datetimetz_timestamptz - _null_ ));
 DESCR("convert date and time with time zone to timestamp with time zone");
 
-DATA(insert OID = 1364 (  time			   PGNSP PGUID 14 f f f t f i 1 1083 "702" 100 0 0 100  "select time(cast($1 as timestamp without time zone))" - _null_ ));
+DATA(insert OID = 1364 (  time			   PGNSP PGUID 14 f f t f i 1 1083 "702"  "select time(cast($1 as timestamp without time zone))" - _null_ ));
 DESCR("convert abstime to time");
 
-DATA(insert OID = 1367 (  character_length	PGNSP PGUID 12 f f f t f i 1	23 "1042" 100 0 0 100  bpcharlen - _null_ ));
+DATA(insert OID = 1367 (  character_length	PGNSP PGUID 12 f f t f i 1	23 "1042"  bpcharlen - _null_ ));
 DESCR("character length");
-DATA(insert OID = 1368 (  character_length	PGNSP PGUID 12 f f f t f i 1	23 "1043" 100 0 0 100  varcharlen - _null_ ));
+DATA(insert OID = 1368 (  character_length	PGNSP PGUID 12 f f t f i 1	23 "1043"  varcharlen - _null_ ));
 DESCR("character length");
-DATA(insert OID = 1369 (  character_length	PGNSP PGUID 12 f f f t f i 1	23 "25" 100 0 0 100  textlen - _null_ ));
+DATA(insert OID = 1369 (  character_length	PGNSP PGUID 12 f f t f i 1	23 "25"  textlen - _null_ ));
 DESCR("character length");
 
-DATA(insert OID = 1370 (  interval			 PGNSP PGUID 12 f f t t f i 1 1186 "1083" 100 0 0 100  time_interval - _null_ ));
+DATA(insert OID = 1370 (  interval			 PGNSP PGUID 12 f f t f i 1 1186 "1083"  time_interval - _null_ ));
 DESCR("convert time to interval");
-DATA(insert OID = 1372 (  char_length		 PGNSP PGUID 12 f f f t f i 1	23	 "1042" 100 0 0 100  bpcharlen - _null_ ));
+DATA(insert OID = 1372 (  char_length		 PGNSP PGUID 12 f f t f i 1	23	 "1042"  bpcharlen - _null_ ));
 DESCR("character length");
-DATA(insert OID = 1373 (  char_length		 PGNSP PGUID 12 f f f t f i 1	23	 "1043" 100 0 0 100  varcharlen - _null_ ));
+DATA(insert OID = 1373 (  char_length		 PGNSP PGUID 12 f f t f i 1	23	 "1043"  varcharlen - _null_ ));
 DESCR("character length");
 
-DATA(insert OID = 1374 (  octet_length			 PGNSP PGUID 12 f f f t f i 1	23	 "25" 100 0 0 100  textoctetlen - _null_ ));
+DATA(insert OID = 1374 (  octet_length			 PGNSP PGUID 12 f f t f i 1	23	 "25"  textoctetlen - _null_ ));
 DESCR("octet length");
-DATA(insert OID = 1375 (  octet_length			 PGNSP PGUID 12 f f f t f i 1	23	 "1042" 100 0 0 100  bpcharoctetlen - _null_ ));
+DATA(insert OID = 1375 (  octet_length			 PGNSP PGUID 12 f f t f i 1	23	 "1042"  bpcharoctetlen - _null_ ));
 DESCR("octet length");
-DATA(insert OID = 1376 (  octet_length			 PGNSP PGUID 12 f f f t f i 1	23	 "1043" 100 0 0 100  varcharoctetlen - _null_ ));
+DATA(insert OID = 1376 (  octet_length			 PGNSP PGUID 12 f f t f i 1	23	 "1043"  varcharoctetlen - _null_ ));
 DESCR("octet length");
 
-DATA(insert OID = 1377 (  time_larger	   PGNSP PGUID 12 f f f t f i 2 1083 "1083 1083" 100 0 0 100  time_larger - _null_ ));
+DATA(insert OID = 1377 (  time_larger	   PGNSP PGUID 12 f f t f i 2 1083 "1083 1083"  time_larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1378 (  time_smaller	   PGNSP PGUID 12 f f f t f i 2 1083 "1083 1083" 100 0 0 100  time_smaller - _null_ ));
+DATA(insert OID = 1378 (  time_smaller	   PGNSP PGUID 12 f f t f i 2 1083 "1083 1083"  time_smaller - _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 1379 (  timetz_larger    PGNSP PGUID 12 f f f t f i 2 1266 "1266 1266" 100 0 0 100  timetz_larger - _null_ ));
+DATA(insert OID = 1379 (  timetz_larger    PGNSP PGUID 12 f f t f i 2 1266 "1266 1266"  timetz_larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1380 (  timetz_smaller   PGNSP PGUID 12 f f f t f i 2 1266 "1266 1266" 100 0 0 100  timetz_smaller - _null_ ));
+DATA(insert OID = 1380 (  timetz_smaller   PGNSP PGUID 12 f f t f i 2 1266 "1266 1266"  timetz_smaller - _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 1381 (  char_length	   PGNSP PGUID 12 f f f t f i 1 23 "25" 100 0 0 100  textlen - _null_ ));
+DATA(insert OID = 1381 (  char_length	   PGNSP PGUID 12 f f t f i 1 23 "25"  textlen - _null_ ));
 DESCR("character length");
 
-DATA(insert OID = 1382 (  date_part    PGNSP PGUID 14 f f f t f s 2  701 "25 702" 100 0 0 100  "select date_part($1, timestamptz($2))" - _null_ ));
+DATA(insert OID = 1382 (  date_part    PGNSP PGUID 14 f f t f s 2  701 "25 702"  "select date_part($1, timestamptz($2))" - _null_ ));
 DESCR("extract field from abstime");
-DATA(insert OID = 1383 (  date_part    PGNSP PGUID 14 f f f t f s 2  701 "25 703" 100 0 0 100  "select date_part($1, cast($2 as interval))" - _null_ ));
+DATA(insert OID = 1383 (  date_part    PGNSP PGUID 14 f f t f s 2  701 "25 703"  "select date_part($1, cast($2 as interval))" - _null_ ));
 DESCR("extract field from reltime");
-DATA(insert OID = 1384 (  date_part    PGNSP PGUID 14 f f f t f i 2  701 "25 1082" 100 0 0 100	"select date_part($1, cast($2 as timestamp without time zone))" - _null_ ));
+DATA(insert OID = 1384 (  date_part    PGNSP PGUID 14 f f t f i 2  701 "25 1082"	"select date_part($1, cast($2 as timestamp without time zone))" - _null_ ));
 DESCR("extract field from date");
-DATA(insert OID = 1385 (  date_part	   PGNSP PGUID 12 f f f t f i 2  701 "25 1083" 100 0 0 100  time_part - _null_ ));
+DATA(insert OID = 1385 (  date_part	   PGNSP PGUID 12 f f t f i 2  701 "25 1083"  time_part - _null_ ));
 DESCR("extract field from time");
-DATA(insert OID = 1386 (  age		   PGNSP PGUID 14 f f f t f s 1 1186 "1184" 100 0 0 100  "select age(cast(current_date as timestamp with time zone), $1)" - _null_ ));
+DATA(insert OID = 1386 (  age		   PGNSP PGUID 14 f f t f s 1 1186 "1184"  "select age(cast(current_date as timestamp with time zone), $1)" - _null_ ));
 DESCR("date difference from today preserving months and years");
 
-DATA(insert OID = 1388 (  timetz	   PGNSP PGUID 12 f f f t f s 1 1266 "1184" 100 0 0 100  timestamptz_timetz - _null_ ));
+DATA(insert OID = 1388 (  timetz	   PGNSP PGUID 12 f f t f s 1 1266 "1184"  timestamptz_timetz - _null_ ));
 DESCR("convert timestamptz to timetz");
 
-DATA(insert OID = 1389 (  isfinite	   PGNSP PGUID 12 f f f t f i 1 16 "1184" 100 0 0 100  timestamp_finite - _null_ ));
+DATA(insert OID = 1389 (  isfinite	   PGNSP PGUID 12 f f t f i 1 16 "1184"  timestamp_finite - _null_ ));
 DESCR("boolean test");
-DATA(insert OID = 1390 (  isfinite	   PGNSP PGUID 12 f f f t f i 1 16 "1186" 100 0 0 100  interval_finite - _null_ ));
+DATA(insert OID = 1390 (  isfinite	   PGNSP PGUID 12 f f t f i 1 16 "1186"  interval_finite - _null_ ));
 DESCR("boolean test");
 
 
-DATA(insert OID = 1391 (  factorial		   PGNSP PGUID 12 f f f t f i 1 23 "21" 100 0 0 100  int2fac - _null_ ));
+DATA(insert OID = 1391 (  factorial		   PGNSP PGUID 12 f f t f i 1 23 "21"  int2fac - _null_ ));
 DESCR("factorial");
-DATA(insert OID = 1392 (  factorial		   PGNSP PGUID 12 f f f t f i 1 23 "23" 100 0 0 100  int4fac - _null_ ));
+DATA(insert OID = 1392 (  factorial		   PGNSP PGUID 12 f f t f i 1 23 "23"  int4fac - _null_ ));
 DESCR("factorial");
-DATA(insert OID = 1393 (  factorial		   PGNSP PGUID 12 f f f t f i 1 20 "20" 100 0 0 100  int8fac - _null_ ));
+DATA(insert OID = 1393 (  factorial		   PGNSP PGUID 12 f f t f i 1 20 "20"  int8fac - _null_ ));
 DESCR("factorial");
-DATA(insert OID = 1394 (  abs			   PGNSP PGUID 12 f f f t f i 1 700 "700" 100 0 0 100  float4abs - _null_ ));
+DATA(insert OID = 1394 (  abs			   PGNSP PGUID 12 f f t f i 1 700 "700"  float4abs - _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1395 (  abs			   PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100  float8abs - _null_ ));
+DATA(insert OID = 1395 (  abs			   PGNSP PGUID 12 f f t f i 1 701 "701"  float8abs - _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1396 (  abs			   PGNSP PGUID 12 f f f t f i 1 20 "20" 100 0 0 100  int8abs - _null_ ));
+DATA(insert OID = 1396 (  abs			   PGNSP PGUID 12 f f t f i 1 20 "20"  int8abs - _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1397 (  abs			   PGNSP PGUID 12 f f f t f i 1 23 "23" 100 0 0 100  int4abs - _null_ ));
+DATA(insert OID = 1397 (  abs			   PGNSP PGUID 12 f f t f i 1 23 "23"  int4abs - _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1398 (  abs			   PGNSP PGUID 12 f f f t f i 1 21 "21" 100 0 0 100  int2abs - _null_ ));
+DATA(insert OID = 1398 (  abs			   PGNSP PGUID 12 f f t f i 1 21 "21"  int2abs - _null_ ));
 DESCR("absolute value");
 
 /* OIDS 1400 - 1499 */
 
-DATA(insert OID = 1400 (  name		   PGNSP PGUID 12 f f t t f i 1 19 "1043" 100 0 0 100  text_name - _null_ ));
+DATA(insert OID = 1400 (  name		   PGNSP PGUID 12 f f t f i 1 19 "1043"  text_name - _null_ ));
 DESCR("convert varchar to name");
-DATA(insert OID = 1401 (  varchar	   PGNSP PGUID 12 f f t t f i 1 1043 "19" 100 0 0 100  name_text - _null_ ));
+DATA(insert OID = 1401 (  varchar	   PGNSP PGUID 12 f f t f i 1 1043 "19"  name_text - _null_ ));
 DESCR("convert name to varchar");
 
-DATA(insert OID = 1402 (  current_schema	PGNSP PGUID 12 f f f t f s 0    19 "0" 100 0 0 100	current_schema - _null_ ));
+DATA(insert OID = 1402 (  current_schema	PGNSP PGUID 12 f f t f s 0    19 "0"	current_schema - _null_ ));
 DESCR("current schema name");
-DATA(insert OID = 1403 (  current_schemas	PGNSP PGUID 12 f f f t f s 1  1003 "16" 100 0 0 100	current_schemas - _null_ ));
+DATA(insert OID = 1403 (  current_schemas	PGNSP PGUID 12 f f t f s 1  1003 "16"	current_schemas - _null_ ));
 DESCR("current schema search list");
 
-DATA(insert OID = 1404 (  overlay			PGNSP PGUID 14 f f f t f i 4 25 "25 25 23 23" 100 0 0 100  "select substring($1, 1, ($3 - 1)) || $2 || substring($1, ($3 + $4))" - _null_ ));
+DATA(insert OID = 1404 (  overlay			PGNSP PGUID 14 f f t f i 4 25 "25 25 23 23"  "select substring($1, 1, ($3 - 1)) || $2 || substring($1, ($3 + $4))" - _null_ ));
 DESCR("substitute portion of string");
-DATA(insert OID = 1405 (  overlay			PGNSP PGUID 14 f f f t f i 3 25 "25 25 23" 100 0 0 100  "select substring($1, 1, ($3 - 1)) || $2 || substring($1, ($3 + char_length($2)))" - _null_ ));
+DATA(insert OID = 1405 (  overlay			PGNSP PGUID 14 f f t f i 3 25 "25 25 23"  "select substring($1, 1, ($3 - 1)) || $2 || substring($1, ($3 + char_length($2)))" - _null_ ));
 DESCR("substitute portion of string");
 
-DATA(insert OID = 1406 (  isvertical		PGNSP PGUID 12 f f f t f i 2	16 "600 600" 100 0 0 100  point_vert - _null_ ));
+DATA(insert OID = 1406 (  isvertical		PGNSP PGUID 12 f f t f i 2	16 "600 600"  point_vert - _null_ ));
 DESCR("vertically aligned?");
-DATA(insert OID = 1407 (  ishorizontal		PGNSP PGUID 12 f f f t f i 2	16 "600 600" 100 0 0 100  point_horiz - _null_ ));
+DATA(insert OID = 1407 (  ishorizontal		PGNSP PGUID 12 f f t f i 2	16 "600 600"  point_horiz - _null_ ));
 DESCR("horizontally aligned?");
-DATA(insert OID = 1408 (  isparallel		PGNSP PGUID 12 f f f t f i 2	16 "601 601" 100 0 0 100  lseg_parallel - _null_ ));
+DATA(insert OID = 1408 (  isparallel		PGNSP PGUID 12 f f t f i 2	16 "601 601"  lseg_parallel - _null_ ));
 DESCR("parallel?");
-DATA(insert OID = 1409 (  isperp			PGNSP PGUID 12 f f f t f i 2	16 "601 601" 100 0 0 100  lseg_perp - _null_ ));
+DATA(insert OID = 1409 (  isperp			PGNSP PGUID 12 f f t f i 2	16 "601 601"  lseg_perp - _null_ ));
 DESCR("perpendicular?");
-DATA(insert OID = 1410 (  isvertical		PGNSP PGUID 12 f f f t f i 1	16 "601" 100 0 0 100  lseg_vertical - _null_ ));
+DATA(insert OID = 1410 (  isvertical		PGNSP PGUID 12 f f t f i 1	16 "601"  lseg_vertical - _null_ ));
 DESCR("vertical?");
-DATA(insert OID = 1411 (  ishorizontal		PGNSP PGUID 12 f f f t f i 1	16 "601" 100 0 0 100  lseg_horizontal - _null_ ));
+DATA(insert OID = 1411 (  ishorizontal		PGNSP PGUID 12 f f t f i 1	16 "601"  lseg_horizontal - _null_ ));
 DESCR("horizontal?");
-DATA(insert OID = 1412 (  isparallel		PGNSP PGUID 12 f f f t f i 2	16 "628 628" 100 0 0 100  line_parallel - _null_ ));
+DATA(insert OID = 1412 (  isparallel		PGNSP PGUID 12 f f t f i 2	16 "628 628"  line_parallel - _null_ ));
 DESCR("lines parallel?");
-DATA(insert OID = 1413 (  isperp			PGNSP PGUID 12 f f f t f i 2	16 "628 628" 100 0 0 100  line_perp - _null_ ));
+DATA(insert OID = 1413 (  isperp			PGNSP PGUID 12 f f t f i 2	16 "628 628"  line_perp - _null_ ));
 DESCR("lines perpendicular?");
-DATA(insert OID = 1414 (  isvertical		PGNSP PGUID 12 f f f t f i 1	16 "628" 100 0 0 100  line_vertical - _null_ ));
+DATA(insert OID = 1414 (  isvertical		PGNSP PGUID 12 f f t f i 1	16 "628"  line_vertical - _null_ ));
 DESCR("lines vertical?");
-DATA(insert OID = 1415 (  ishorizontal		PGNSP PGUID 12 f f f t f i 1	16 "628" 100 0 0 100  line_horizontal - _null_ ));
+DATA(insert OID = 1415 (  ishorizontal		PGNSP PGUID 12 f f t f i 1	16 "628"  line_horizontal - _null_ ));
 DESCR("lines horizontal?");
-DATA(insert OID = 1416 (  point				PGNSP PGUID 12 f f f t f i 1 600 "718" 100 0 0 100	circle_center - _null_ ));
+DATA(insert OID = 1416 (  point				PGNSP PGUID 12 f f t f i 1 600 "718"	circle_center - _null_ ));
 DESCR("center of");
 
-DATA(insert OID = 1417 (  isnottrue			PGNSP PGUID 12 f f f f f i 1 16 "16" 100 0 0 100  isnottrue - _null_ ));
+DATA(insert OID = 1417 (  isnottrue			PGNSP PGUID 12 f f f f i 1 16 "16"  isnottrue - _null_ ));
 DESCR("bool is not true (ie, false or unknown)");
-DATA(insert OID = 1418 (  isnotfalse		PGNSP PGUID 12 f f f f f i 1 16 "16" 100 0 0 100  isnotfalse - _null_ ));
+DATA(insert OID = 1418 (  isnotfalse		PGNSP PGUID 12 f f f f i 1 16 "16"  isnotfalse - _null_ ));
 DESCR("bool is not false (ie, true or unknown)");
 
-DATA(insert OID = 1419 (  time				PGNSP PGUID 12 f f f t f i 1 1083 "1186" 100 0 0 100  interval_time - _null_ ));
+DATA(insert OID = 1419 (  time				PGNSP PGUID 12 f f t f i 1 1083 "1186"  interval_time - _null_ ));
 DESCR("convert interval to time");
 
-DATA(insert OID = 1421 (  box				PGNSP PGUID 12 f f f t f i 2 603 "600 600" 100 0 0 100	points_box - _null_ ));
+DATA(insert OID = 1421 (  box				PGNSP PGUID 12 f f t f i 2 603 "600 600"	points_box - _null_ ));
 DESCR("convert points to box");
-DATA(insert OID = 1422 (  box_add			PGNSP PGUID 12 f f f t f i 2 603 "603 600" 100 0 0 100	box_add - _null_ ));
+DATA(insert OID = 1422 (  box_add			PGNSP PGUID 12 f f t f i 2 603 "603 600"	box_add - _null_ ));
 DESCR("add point to box (translate)");
-DATA(insert OID = 1423 (  box_sub			PGNSP PGUID 12 f f f t f i 2 603 "603 600" 100 0 0 100	box_sub - _null_ ));
+DATA(insert OID = 1423 (  box_sub			PGNSP PGUID 12 f f t f i 2 603 "603 600"	box_sub - _null_ ));
 DESCR("subtract point from box (translate)");
-DATA(insert OID = 1424 (  box_mul			PGNSP PGUID 12 f f f t f i 2 603 "603 600" 100 0 0 100	box_mul - _null_ ));
+DATA(insert OID = 1424 (  box_mul			PGNSP PGUID 12 f f t f i 2 603 "603 600"	box_mul - _null_ ));
 DESCR("multiply box by point (scale)");
-DATA(insert OID = 1425 (  box_div			PGNSP PGUID 12 f f f t f i 2 603 "603 600" 100 0 0 100	box_div - _null_ ));
+DATA(insert OID = 1425 (  box_div			PGNSP PGUID 12 f f t f i 2 603 "603 600"	box_div - _null_ ));
 DESCR("divide box by point (scale)");
-DATA(insert OID = 1426 (  path_contain_pt	PGNSP PGUID 14 f f f t f i 2	16 "602 600" 100 0 0 100  "select on_ppath($2, $1)" - _null_ ));
+DATA(insert OID = 1426 (  path_contain_pt	PGNSP PGUID 14 f f t f i 2	16 "602 600"  "select on_ppath($2, $1)" - _null_ ));
 DESCR("path contains point?");
-DATA(insert OID = 1428 (  poly_contain_pt	PGNSP PGUID 12 f f f t f i 2	16 "604 600" 100 0 0 100  poly_contain_pt - _null_ ));
+DATA(insert OID = 1428 (  poly_contain_pt	PGNSP PGUID 12 f f t f i 2	16 "604 600"  poly_contain_pt - _null_ ));
 DESCR("polygon contains point?");
-DATA(insert OID = 1429 (  pt_contained_poly PGNSP PGUID 12 f f f t f i 2	16 "600 604" 100 0 0 100  pt_contained_poly - _null_ ));
+DATA(insert OID = 1429 (  pt_contained_poly PGNSP PGUID 12 f f t f i 2	16 "600 604"  pt_contained_poly - _null_ ));
 DESCR("point contained by polygon?");
 
-DATA(insert OID = 1430 (  isclosed			PGNSP PGUID 12 f f f t f i 1	16 "602" 100 0 0 100  path_isclosed - _null_ ));
+DATA(insert OID = 1430 (  isclosed			PGNSP PGUID 12 f f t f i 1	16 "602"  path_isclosed - _null_ ));
 DESCR("path closed?");
-DATA(insert OID = 1431 (  isopen			PGNSP PGUID 12 f f f t f i 1	16 "602" 100 0 0 100  path_isopen - _null_ ));
+DATA(insert OID = 1431 (  isopen			PGNSP PGUID 12 f f t f i 1	16 "602"  path_isopen - _null_ ));
 DESCR("path open?");
-DATA(insert OID = 1432 (  path_npoints		PGNSP PGUID 12 f f f t f i 1	23 "602" 100 0 0 100  path_npoints - _null_ ));
+DATA(insert OID = 1432 (  path_npoints		PGNSP PGUID 12 f f t f i 1	23 "602"  path_npoints - _null_ ));
 DESCR("# points in path");
 
 /* pclose and popen might better be named close and open, but that crashes initdb.
  * - thomas 97/04/20
  */
 
-DATA(insert OID = 1433 (  pclose			PGNSP PGUID 12 f f f t f i 1 602 "602" 100 0 0 100	path_close - _null_ ));
+DATA(insert OID = 1433 (  pclose			PGNSP PGUID 12 f f t f i 1 602 "602"	path_close - _null_ ));
 DESCR("close path");
-DATA(insert OID = 1434 (  popen				PGNSP PGUID 12 f f f t f i 1 602 "602" 100 0 0 100	path_open - _null_ ));
+DATA(insert OID = 1434 (  popen				PGNSP PGUID 12 f f t f i 1 602 "602"	path_open - _null_ ));
 DESCR("open path");
-DATA(insert OID = 1435 (  path_add			PGNSP PGUID 12 f f f t f i 2 602 "602 602" 100 0 0 100	path_add - _null_ ));
+DATA(insert OID = 1435 (  path_add			PGNSP PGUID 12 f f t f i 2 602 "602 602"	path_add - _null_ ));
 DESCR("concatenate open paths");
-DATA(insert OID = 1436 (  path_add_pt		PGNSP PGUID 12 f f f t f i 2 602 "602 600" 100 0 0 100	path_add_pt - _null_ ));
+DATA(insert OID = 1436 (  path_add_pt		PGNSP PGUID 12 f f t f i 2 602 "602 600"	path_add_pt - _null_ ));
 DESCR("add (translate path)");
-DATA(insert OID = 1437 (  path_sub_pt		PGNSP PGUID 12 f f f t f i 2 602 "602 600" 100 0 0 100	path_sub_pt - _null_ ));
+DATA(insert OID = 1437 (  path_sub_pt		PGNSP PGUID 12 f f t f i 2 602 "602 600"	path_sub_pt - _null_ ));
 DESCR("subtract (translate path)");
-DATA(insert OID = 1438 (  path_mul_pt		PGNSP PGUID 12 f f f t f i 2 602 "602 600" 100 0 0 100	path_mul_pt - _null_ ));
+DATA(insert OID = 1438 (  path_mul_pt		PGNSP PGUID 12 f f t f i 2 602 "602 600"	path_mul_pt - _null_ ));
 DESCR("multiply (rotate/scale path)");
-DATA(insert OID = 1439 (  path_div_pt		PGNSP PGUID 12 f f f t f i 2 602 "602 600" 100 0 0 100	path_div_pt - _null_ ));
+DATA(insert OID = 1439 (  path_div_pt		PGNSP PGUID 12 f f t f i 2 602 "602 600"	path_div_pt - _null_ ));
 DESCR("divide (rotate/scale path)");
 
-DATA(insert OID = 1440 (  point				PGNSP PGUID 12 f f f t f i 2 600 "701 701" 100 0 0 100	construct_point - _null_ ));
+DATA(insert OID = 1440 (  point				PGNSP PGUID 12 f f t f i 2 600 "701 701"	construct_point - _null_ ));
 DESCR("convert x, y to point");
-DATA(insert OID = 1441 (  point_add			PGNSP PGUID 12 f f f t f i 2 600 "600 600" 100 0 0 100	point_add - _null_ ));
+DATA(insert OID = 1441 (  point_add			PGNSP PGUID 12 f f t f i 2 600 "600 600"	point_add - _null_ ));
 DESCR("add points (translate)");
-DATA(insert OID = 1442 (  point_sub			PGNSP PGUID 12 f f f t f i 2 600 "600 600" 100 0 0 100	point_sub - _null_ ));
+DATA(insert OID = 1442 (  point_sub			PGNSP PGUID 12 f f t f i 2 600 "600 600"	point_sub - _null_ ));
 DESCR("subtract points (translate)");
-DATA(insert OID = 1443 (  point_mul			PGNSP PGUID 12 f f f t f i 2 600 "600 600" 100 0 0 100	point_mul - _null_ ));
+DATA(insert OID = 1443 (  point_mul			PGNSP PGUID 12 f f t f i 2 600 "600 600"	point_mul - _null_ ));
 DESCR("multiply points (scale/rotate)");
-DATA(insert OID = 1444 (  point_div			PGNSP PGUID 12 f f f t f i 2 600 "600 600" 100 0 0 100	point_div - _null_ ));
+DATA(insert OID = 1444 (  point_div			PGNSP PGUID 12 f f t f i 2 600 "600 600"	point_div - _null_ ));
 DESCR("divide points (scale/rotate)");
 
-DATA(insert OID = 1445 (  poly_npoints		PGNSP PGUID 12 f f f t f i 1	23 "604" 100 0 0 100  poly_npoints - _null_ ));
+DATA(insert OID = 1445 (  poly_npoints		PGNSP PGUID 12 f f t f i 1	23 "604"  poly_npoints - _null_ ));
 DESCR("number of points in polygon");
-DATA(insert OID = 1446 (  box				PGNSP PGUID 12 f f f t f i 1 603 "604" 100 0 0 100	poly_box - _null_ ));
+DATA(insert OID = 1446 (  box				PGNSP PGUID 12 f f t f i 1 603 "604"	poly_box - _null_ ));
 DESCR("convert polygon to bounding box");
-DATA(insert OID = 1447 (  path				PGNSP PGUID 12 f f f t f i 1 602 "604" 100 0 0 100	poly_path - _null_ ));
+DATA(insert OID = 1447 (  path				PGNSP PGUID 12 f f t f i 1 602 "604"	poly_path - _null_ ));
 DESCR("convert polygon to path");
-DATA(insert OID = 1448 (  polygon			PGNSP PGUID 12 f f f t f i 1 604 "603" 100 0 0 100	box_poly - _null_ ));
+DATA(insert OID = 1448 (  polygon			PGNSP PGUID 12 f f t f i 1 604 "603"	box_poly - _null_ ));
 DESCR("convert box to polygon");
-DATA(insert OID = 1449 (  polygon			PGNSP PGUID 12 f f f t f i 1 604 "602" 100 0 0 100	path_poly - _null_ ));
+DATA(insert OID = 1449 (  polygon			PGNSP PGUID 12 f f t f i 1 604 "602"	path_poly - _null_ ));
 DESCR("convert path to polygon");
 
-DATA(insert OID = 1450 (  circle_in			PGNSP PGUID 12 f f f t f i 1 718 "0" 100 0 0 100  circle_in - _null_ ));
+DATA(insert OID = 1450 (  circle_in			PGNSP PGUID 12 f f t f i 1 718 "0"  circle_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1451 (  circle_out		PGNSP PGUID 12 f f f t f i 1	23	"718" 100 0 0 100  circle_out - _null_ ));
+DATA(insert OID = 1451 (  circle_out		PGNSP PGUID 12 f f t f i 1	23	"718"  circle_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1452 (  circle_same		PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_same - _null_ ));
+DATA(insert OID = 1452 (  circle_same		PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_same - _null_ ));
 DESCR("same as");
-DATA(insert OID = 1453 (  circle_contain	PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_contain - _null_ ));
+DATA(insert OID = 1453 (  circle_contain	PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_contain - _null_ ));
 DESCR("contains");
-DATA(insert OID = 1454 (  circle_left		PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_left - _null_ ));
+DATA(insert OID = 1454 (  circle_left		PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_left - _null_ ));
 DESCR("is left of");
-DATA(insert OID = 1455 (  circle_overleft	PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_overleft - _null_ ));
+DATA(insert OID = 1455 (  circle_overleft	PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_overleft - _null_ ));
 DESCR("overlaps, but does not extend to right of");
-DATA(insert OID = 1456 (  circle_overright	PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_overright - _null_ ));
+DATA(insert OID = 1456 (  circle_overright	PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_overright - _null_ ));
 DESCR("");
-DATA(insert OID = 1457 (  circle_right		PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_right - _null_ ));
+DATA(insert OID = 1457 (  circle_right		PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_right - _null_ ));
 DESCR("is right of");
-DATA(insert OID = 1458 (  circle_contained	PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_contained - _null_ ));
+DATA(insert OID = 1458 (  circle_contained	PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_contained - _null_ ));
 DESCR("");
-DATA(insert OID = 1459 (  circle_overlap	PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_overlap - _null_ ));
+DATA(insert OID = 1459 (  circle_overlap	PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_overlap - _null_ ));
 DESCR("overlaps");
-DATA(insert OID = 1460 (  circle_below		PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_below - _null_ ));
+DATA(insert OID = 1460 (  circle_below		PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_below - _null_ ));
 DESCR("is below");
-DATA(insert OID = 1461 (  circle_above		PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_above - _null_ ));
+DATA(insert OID = 1461 (  circle_above		PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_above - _null_ ));
 DESCR("is above");
-DATA(insert OID = 1462 (  circle_eq			PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_eq - _null_ ));
+DATA(insert OID = 1462 (  circle_eq			PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_eq - _null_ ));
 DESCR("equal by area");
-DATA(insert OID = 1463 (  circle_ne			PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_ne - _null_ ));
+DATA(insert OID = 1463 (  circle_ne			PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_ne - _null_ ));
 DESCR("not equal by area");
-DATA(insert OID = 1464 (  circle_lt			PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_lt - _null_ ));
+DATA(insert OID = 1464 (  circle_lt			PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_lt - _null_ ));
 DESCR("less-than by area");
-DATA(insert OID = 1465 (  circle_gt			PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_gt - _null_ ));
+DATA(insert OID = 1465 (  circle_gt			PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_gt - _null_ ));
 DESCR("greater-than by area");
-DATA(insert OID = 1466 (  circle_le			PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_le - _null_ ));
+DATA(insert OID = 1466 (  circle_le			PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_le - _null_ ));
 DESCR("less-than-or-equal by area");
-DATA(insert OID = 1467 (  circle_ge			PGNSP PGUID 12 f f f t f i 2	16 "718 718" 100 0 0 100  circle_ge - _null_ ));
+DATA(insert OID = 1467 (  circle_ge			PGNSP PGUID 12 f f t f i 2	16 "718 718"  circle_ge - _null_ ));
 DESCR("greater-than-or-equal by area");
-DATA(insert OID = 1468 (  area				PGNSP PGUID 12 f f f t f i 1 701 "718" 100 0 0 100	circle_area - _null_ ));
+DATA(insert OID = 1468 (  area				PGNSP PGUID 12 f f t f i 1 701 "718"	circle_area - _null_ ));
 DESCR("area of circle");
-DATA(insert OID = 1469 (  diameter			PGNSP PGUID 12 f f f t f i 1 701 "718" 100 0 0 100	circle_diameter - _null_ ));
+DATA(insert OID = 1469 (  diameter			PGNSP PGUID 12 f f t f i 1 701 "718"	circle_diameter - _null_ ));
 DESCR("diameter of circle");
-DATA(insert OID = 1470 (  radius			PGNSP PGUID 12 f f f t f i 1 701 "718" 100 0 0 100	circle_radius - _null_ ));
+DATA(insert OID = 1470 (  radius			PGNSP PGUID 12 f f t f i 1 701 "718"	circle_radius - _null_ ));
 DESCR("radius of circle");
-DATA(insert OID = 1471 (  circle_distance	PGNSP PGUID 12 f f f t f i 2 701 "718 718" 100 0 0 100	circle_distance - _null_ ));
+DATA(insert OID = 1471 (  circle_distance	PGNSP PGUID 12 f f t f i 2 701 "718 718"	circle_distance - _null_ ));
 DESCR("distance between");
-DATA(insert OID = 1472 (  circle_center		PGNSP PGUID 12 f f f t f i 1 600 "718" 100 0 0 100	circle_center - _null_ ));
+DATA(insert OID = 1472 (  circle_center		PGNSP PGUID 12 f f t f i 1 600 "718"	circle_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 1473 (  circle			PGNSP PGUID 12 f f f t f i 2 718 "600 701" 100 0 0 100	cr_circle - _null_ ));
+DATA(insert OID = 1473 (  circle			PGNSP PGUID 12 f f t f i 2 718 "600 701"	cr_circle - _null_ ));
 DESCR("convert point and radius to circle");
-DATA(insert OID = 1474 (  circle			PGNSP PGUID 12 f f f t f i 1 718 "604" 100 0 0 100	poly_circle - _null_ ));
+DATA(insert OID = 1474 (  circle			PGNSP PGUID 12 f f t f i 1 718 "604"	poly_circle - _null_ ));
 DESCR("convert polygon to circle");
-DATA(insert OID = 1475 (  polygon			PGNSP PGUID 12 f f f t f i 2 604 "23 718" 100 0 0 100  circle_poly - _null_ ));
+DATA(insert OID = 1475 (  polygon			PGNSP PGUID 12 f f t f i 2 604 "23 718"  circle_poly - _null_ ));
 DESCR("convert vertex count and circle to polygon");
-DATA(insert OID = 1476 (  dist_pc			PGNSP PGUID 12 f f f t f i 2 701 "600 718" 100 0 0 100	dist_pc - _null_ ));
+DATA(insert OID = 1476 (  dist_pc			PGNSP PGUID 12 f f t f i 2 701 "600 718"	dist_pc - _null_ ));
 DESCR("distance between point and circle");
-DATA(insert OID = 1477 (  circle_contain_pt PGNSP PGUID 12 f f f t f i 2	16 "718 600" 100 0 0 100  circle_contain_pt - _null_ ));
+DATA(insert OID = 1477 (  circle_contain_pt PGNSP PGUID 12 f f t f i 2	16 "718 600"  circle_contain_pt - _null_ ));
 DESCR("circle contains point?");
-DATA(insert OID = 1478 (  pt_contained_circle	PGNSP PGUID 12 f f f t f i 2	16 "600 718" 100 0 0 100  pt_contained_circle - _null_ ));
+DATA(insert OID = 1478 (  pt_contained_circle	PGNSP PGUID 12 f f t f i 2	16 "600 718"  pt_contained_circle - _null_ ));
 DESCR("point inside circle?");
-DATA(insert OID = 1479 (  circle			PGNSP PGUID 12 f f f t f i 1 718 "603" 100 0 0 100	box_circle - _null_ ));
+DATA(insert OID = 1479 (  circle			PGNSP PGUID 12 f f t f i 1 718 "603"	box_circle - _null_ ));
 DESCR("convert box to circle");
-DATA(insert OID = 1480 (  box				PGNSP PGUID 12 f f f t f i 1 603 "718" 100 0 0 100	circle_box - _null_ ));
+DATA(insert OID = 1480 (  box				PGNSP PGUID 12 f f t f i 1 603 "718"	circle_box - _null_ ));
 DESCR("convert circle to box");
-DATA(insert OID = 1481 (  tinterval			 PGNSP PGUID 12 f f f t f i 2 704 "702 702" 100 0 0 100 mktinterval - _null_ ));
+DATA(insert OID = 1481 (  tinterval			 PGNSP PGUID 12 f f t f i 2 704 "702 702" mktinterval - _null_ ));
 DESCR("convert to tinterval");
 
-DATA(insert OID = 1482 (  lseg_ne			PGNSP PGUID 12 f f f t f i 2	16 "601 601" 100 0 0 100  lseg_ne - _null_ ));
+DATA(insert OID = 1482 (  lseg_ne			PGNSP PGUID 12 f f t f i 2	16 "601 601"  lseg_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1483 (  lseg_lt			PGNSP PGUID 12 f f f t f i 2	16 "601 601" 100 0 0 100  lseg_lt - _null_ ));
+DATA(insert OID = 1483 (  lseg_lt			PGNSP PGUID 12 f f t f i 2	16 "601 601"  lseg_lt - _null_ ));
 DESCR("less-than by length");
-DATA(insert OID = 1484 (  lseg_le			PGNSP PGUID 12 f f f t f i 2	16 "601 601" 100 0 0 100  lseg_le - _null_ ));
+DATA(insert OID = 1484 (  lseg_le			PGNSP PGUID 12 f f t f i 2	16 "601 601"  lseg_le - _null_ ));
 DESCR("less-than-or-equal by length");
-DATA(insert OID = 1485 (  lseg_gt			PGNSP PGUID 12 f f f t f i 2	16 "601 601" 100 0 0 100  lseg_gt - _null_ ));
+DATA(insert OID = 1485 (  lseg_gt			PGNSP PGUID 12 f f t f i 2	16 "601 601"  lseg_gt - _null_ ));
 DESCR("greater-than by length");
-DATA(insert OID = 1486 (  lseg_ge			PGNSP PGUID 12 f f f t f i 2	16 "601 601" 100 0 0 100  lseg_ge - _null_ ));
+DATA(insert OID = 1486 (  lseg_ge			PGNSP PGUID 12 f f t f i 2	16 "601 601"  lseg_ge - _null_ ));
 DESCR("greater-than-or-equal by length");
-DATA(insert OID = 1487 (  lseg_length		PGNSP PGUID 12 f f f t f i 1 701 "601" 100 0 0 100	lseg_length - _null_ ));
+DATA(insert OID = 1487 (  lseg_length		PGNSP PGUID 12 f f t f i 1 701 "601"	lseg_length - _null_ ));
 DESCR("distance between endpoints");
-DATA(insert OID = 1488 (  close_ls			PGNSP PGUID 12 f f f t f i 2 600 "628 601" 100 0 0 100	close_ls - _null_ ));
+DATA(insert OID = 1488 (  close_ls			PGNSP PGUID 12 f f t f i 2 600 "628 601"	close_ls - _null_ ));
 DESCR("closest point to line on line segment");
-DATA(insert OID = 1489 (  close_lseg		PGNSP PGUID 12 f f f t f i 2 600 "601 601" 100 0 0 100	close_lseg - _null_ ));
+DATA(insert OID = 1489 (  close_lseg		PGNSP PGUID 12 f f t f i 2 600 "601 601"	close_lseg - _null_ ));
 DESCR("closest point to line segment on line segment");
 
-DATA(insert OID = 1490 (  line_in			PGNSP PGUID 12 f f f t f i 1 628 "0" 100 0 0 100  line_in - _null_ ));
+DATA(insert OID = 1490 (  line_in			PGNSP PGUID 12 f f t f i 1 628 "0"  line_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1491 (  line_out			PGNSP PGUID 12 f f f t f i 1 23  "628" 100 0 0 100	line_out - _null_ ));
+DATA(insert OID = 1491 (  line_out			PGNSP PGUID 12 f f t f i 1 23  "628"	line_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1492 (  line_eq			PGNSP PGUID 12 f f f t f i 2  16 "628 628" 100 0 0 100	line_eq - _null_ ));
+DATA(insert OID = 1492 (  line_eq			PGNSP PGUID 12 f f t f i 2  16 "628 628"	line_eq - _null_ ));
 DESCR("lines equal?");
-DATA(insert OID = 1493 (  line				PGNSP PGUID 12 f f f t f i 2 628 "600 600" 100 0 0 100	line_construct_pp - _null_ ));
+DATA(insert OID = 1493 (  line				PGNSP PGUID 12 f f t f i 2 628 "600 600"	line_construct_pp - _null_ ));
 DESCR("line from points");
-DATA(insert OID = 1494 (  line_interpt		PGNSP PGUID 12 f f f t f i 2 600 "628 628" 100 0 0 100	line_interpt - _null_ ));
+DATA(insert OID = 1494 (  line_interpt		PGNSP PGUID 12 f f t f i 2 600 "628 628"	line_interpt - _null_ ));
 DESCR("intersection point");
-DATA(insert OID = 1495 (  line_intersect	PGNSP PGUID 12 f f f t f i 2	16 "628 628" 100 0 0 100  line_intersect - _null_ ));
+DATA(insert OID = 1495 (  line_intersect	PGNSP PGUID 12 f f t f i 2	16 "628 628"  line_intersect - _null_ ));
 DESCR("lines intersect?");
-DATA(insert OID = 1496 (  line_parallel		PGNSP PGUID 12 f f f t f i 2	16 "628 628" 100 0 0 100  line_parallel - _null_ ));
+DATA(insert OID = 1496 (  line_parallel		PGNSP PGUID 12 f f t f i 2	16 "628 628"  line_parallel - _null_ ));
 DESCR("lines parallel?");
-DATA(insert OID = 1497 (  line_perp			PGNSP PGUID 12 f f f t f i 2	16 "628 628" 100 0 0 100  line_perp - _null_ ));
+DATA(insert OID = 1497 (  line_perp			PGNSP PGUID 12 f f t f i 2	16 "628 628"  line_perp - _null_ ));
 DESCR("lines perpendicular?");
-DATA(insert OID = 1498 (  line_vertical		PGNSP PGUID 12 f f f t f i 1	16 "628" 100 0 0 100  line_vertical - _null_ ));
+DATA(insert OID = 1498 (  line_vertical		PGNSP PGUID 12 f f t f i 1	16 "628"  line_vertical - _null_ ));
 DESCR("lines vertical?");
-DATA(insert OID = 1499 (  line_horizontal	PGNSP PGUID 12 f f f t f i 1	16 "628" 100 0 0 100  line_horizontal - _null_ ));
+DATA(insert OID = 1499 (  line_horizontal	PGNSP PGUID 12 f f t f i 1	16 "628"  line_horizontal - _null_ ));
 DESCR("lines horizontal?");
 
 /* OIDS 1500 - 1599 */
 
-DATA(insert OID = 1530 (  length			PGNSP PGUID 12 f f f t f i 1 701 "601" 100 0 0 100	lseg_length - _null_ ));
+DATA(insert OID = 1530 (  length			PGNSP PGUID 12 f f t f i 1 701 "601"	lseg_length - _null_ ));
 DESCR("distance between endpoints");
-DATA(insert OID = 1531 (  length			PGNSP PGUID 12 f f f t f i 1 701 "602" 100 0 0 100	path_length - _null_ ));
+DATA(insert OID = 1531 (  length			PGNSP PGUID 12 f f t f i 1 701 "602"	path_length - _null_ ));
 DESCR("sum of path segments");
 
 
-DATA(insert OID = 1532 (  point				PGNSP PGUID 12 f f f t f i 1 600 "601" 100 0 0 100	lseg_center - _null_ ));
+DATA(insert OID = 1532 (  point				PGNSP PGUID 12 f f t f i 1 600 "601"	lseg_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 1533 (  point				PGNSP PGUID 12 f f f t f i 1 600 "602" 100 0 0 100	path_center - _null_ ));
+DATA(insert OID = 1533 (  point				PGNSP PGUID 12 f f t f i 1 600 "602"	path_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 1534 (  point				PGNSP PGUID 12 f f f t f i 1 600 "603" 100 0 0 100	box_center - _null_ ));
+DATA(insert OID = 1534 (  point				PGNSP PGUID 12 f f t f i 1 600 "603"	box_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 1540 (  point				PGNSP PGUID 12 f f f t f i 1 600 "604" 100 0 0 100	poly_center - _null_ ));
+DATA(insert OID = 1540 (  point				PGNSP PGUID 12 f f t f i 1 600 "604"	poly_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 1541 (  lseg				PGNSP PGUID 12 f f f t f i 1 601 "603" 100 0 0 100	box_diagonal - _null_ ));
+DATA(insert OID = 1541 (  lseg				PGNSP PGUID 12 f f t f i 1 601 "603"	box_diagonal - _null_ ));
 DESCR("diagonal of");
-DATA(insert OID = 1542 (  center			PGNSP PGUID 12 f f f t f i 1 600 "603" 100 0 0 100	box_center - _null_ ));
+DATA(insert OID = 1542 (  center			PGNSP PGUID 12 f f t f i 1 600 "603"	box_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 1543 (  center			PGNSP PGUID 12 f f f t f i 1 600 "718" 100 0 0 100	circle_center - _null_ ));
+DATA(insert OID = 1543 (  center			PGNSP PGUID 12 f f t f i 1 600 "718"	circle_center - _null_ ));
 DESCR("center of");
-DATA(insert OID = 1544 (  polygon			PGNSP PGUID 14 f f f t f i 1 604 "718" 100 0 0 100	"select polygon(12, $1)" - _null_ ));
+DATA(insert OID = 1544 (  polygon			PGNSP PGUID 14 f f t f i 1 604 "718"	"select polygon(12, $1)" - _null_ ));
 DESCR("convert circle to 12-vertex polygon");
-DATA(insert OID = 1545 (  npoints			PGNSP PGUID 12 f f f t f i 1	23 "602" 100 0 0 100  path_npoints - _null_ ));
+DATA(insert OID = 1545 (  npoints			PGNSP PGUID 12 f f t f i 1	23 "602"  path_npoints - _null_ ));
 DESCR("# points in path");
-DATA(insert OID = 1556 (  npoints			PGNSP PGUID 12 f f f t f i 1	23 "604" 100 0 0 100  poly_npoints - _null_ ));
+DATA(insert OID = 1556 (  npoints			PGNSP PGUID 12 f f t f i 1	23 "604"  poly_npoints - _null_ ));
 DESCR("number of points in polygon");
 
-DATA(insert OID = 1564 (  bit_in			PGNSP PGUID 12 f f f t f i 1 1560 "0" 100 0 0 100  bit_in - _null_ ));
+DATA(insert OID = 1564 (  bit_in			PGNSP PGUID 12 f f t f i 1 1560 "0"  bit_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1565 (  bit_out			PGNSP PGUID 12 f f f t f i 1   23 "0" 100 0 0 100  bit_out - _null_ ));
+DATA(insert OID = 1565 (  bit_out			PGNSP PGUID 12 f f t f i 1   23 "0"  bit_out - _null_ ));
 DESCR("(internal)");
 
-DATA(insert OID = 1569 (  like				PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100  textlike - _null_ ));
+DATA(insert OID = 1569 (  like				PGNSP PGUID 12 f f t f i 2 16 "25 25"  textlike - _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID = 1570 (  notlike			PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100  textnlike - _null_ ));
+DATA(insert OID = 1570 (  notlike			PGNSP PGUID 12 f f t f i 2 16 "25 25"  textnlike - _null_ ));
 DESCR("does not match LIKE expression");
-DATA(insert OID = 1571 (  like				PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100  namelike - _null_ ));
+DATA(insert OID = 1571 (  like				PGNSP PGUID 12 f f t f i 2 16 "19 25"  namelike - _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID = 1572 (  notlike			PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100  namenlike - _null_ ));
+DATA(insert OID = 1572 (  notlike			PGNSP PGUID 12 f f t f i 2 16 "19 25"  namenlike - _null_ ));
 DESCR("does not match LIKE expression");
 
 
 /* SEQUENCEs nextval & currval functions */
-DATA(insert OID = 1574 (  nextval			PGNSP PGUID 12 f f f t f v 1 20 "25" 100 0 0 100  nextval - _null_ ));
+DATA(insert OID = 1574 (  nextval			PGNSP PGUID 12 f f t f v 1 20 "25"  nextval - _null_ ));
 DESCR("sequence next value");
-DATA(insert OID = 1575 (  currval			PGNSP PGUID 12 f f f t f v 1 20 "25" 100 0 0 100  currval - _null_ ));
+DATA(insert OID = 1575 (  currval			PGNSP PGUID 12 f f t f v 1 20 "25"  currval - _null_ ));
 DESCR("sequence current value");
-DATA(insert OID = 1576 (  setval			PGNSP PGUID 12 f f f t f v 2 20 "25 20" 100 0 0 100  setval - _null_ ));
+DATA(insert OID = 1576 (  setval			PGNSP PGUID 12 f f t f v 2 20 "25 20"  setval - _null_ ));
 DESCR("set sequence value");
-DATA(insert OID = 1765 (  setval			PGNSP PGUID 12 f f f t f v 3 20 "25 20 16" 100 0 0 100	setval_and_iscalled - _null_ ));
+DATA(insert OID = 1765 (  setval			PGNSP PGUID 12 f f t f v 3 20 "25 20 16"	setval_and_iscalled - _null_ ));
 DESCR("set sequence value and iscalled status");
 
-DATA(insert OID = 1579 (  varbit_in			PGNSP PGUID 12 f f f t f i 1 1562 "0" 100 0 0 100  varbit_in - _null_ ));
+DATA(insert OID = 1579 (  varbit_in			PGNSP PGUID 12 f f t f i 1 1562 "0"  varbit_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1580 (  varbit_out		PGNSP PGUID 12 f f f t f i 1   23 "0" 100 0 0 100  varbit_out - _null_ ));
+DATA(insert OID = 1580 (  varbit_out		PGNSP PGUID 12 f f t f i 1   23 "0"  varbit_out - _null_ ));
 DESCR("(internal)");
 
-DATA(insert OID = 1581 (  biteq				PGNSP PGUID 12 f f f t f i 2 16 "1560 1560" 100 0 0 100  biteq - _null_ ));
+DATA(insert OID = 1581 (  biteq				PGNSP PGUID 12 f f t f i 2 16 "1560 1560"  biteq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1582 (  bitne				PGNSP PGUID 12 f f f t f i 2 16 "1560 1560" 100 0 0 100  bitne - _null_ ));
+DATA(insert OID = 1582 (  bitne				PGNSP PGUID 12 f f t f i 2 16 "1560 1560"  bitne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1592 (  bitge				PGNSP PGUID 12 f f f t f i 2 16 "1560 1560" 100 0 0 100  bitge - _null_ ));
+DATA(insert OID = 1592 (  bitge				PGNSP PGUID 12 f f t f i 2 16 "1560 1560"  bitge - _null_ ));
 DESCR("greater than or equal");
-DATA(insert OID = 1593 (  bitgt				PGNSP PGUID 12 f f f t f i 2 16 "1560 1560" 100 0 0 100  bitgt - _null_ ));
+DATA(insert OID = 1593 (  bitgt				PGNSP PGUID 12 f f t f i 2 16 "1560 1560"  bitgt - _null_ ));
 DESCR("greater than");
-DATA(insert OID = 1594 (  bitle				PGNSP PGUID 12 f f f t f i 2 16 "1560 1560" 100 0 0 100  bitle - _null_ ));
+DATA(insert OID = 1594 (  bitle				PGNSP PGUID 12 f f t f i 2 16 "1560 1560"  bitle - _null_ ));
 DESCR("less than or equal");
-DATA(insert OID = 1595 (  bitlt				PGNSP PGUID 12 f f f t f i 2 16 "1560 1560" 100 0 0 100  bitlt - _null_ ));
+DATA(insert OID = 1595 (  bitlt				PGNSP PGUID 12 f f t f i 2 16 "1560 1560"  bitlt - _null_ ));
 DESCR("less than");
-DATA(insert OID = 1596 (  bitcmp			PGNSP PGUID 12 f f f t f i 2 23 "1560 1560" 100 0 0 100  bitcmp - _null_ ));
+DATA(insert OID = 1596 (  bitcmp			PGNSP PGUID 12 f f t f i 2 23 "1560 1560"  bitcmp - _null_ ));
 DESCR("compare");
 
-DATA(insert OID = 1598 (  random			PGNSP PGUID 12 f f f t f v 0 701 "0" 100 0 0 100  drandom - _null_ ));
+DATA(insert OID = 1598 (  random			PGNSP PGUID 12 f f t f v 0 701 "0"  drandom - _null_ ));
 DESCR("random value");
-DATA(insert OID = 1599 (  setseed			PGNSP PGUID 12 f f f t f v 1  23 "701" 100 0 0 100	setseed - _null_ ));
+DATA(insert OID = 1599 (  setseed			PGNSP PGUID 12 f f t f v 1  23 "701"	setseed - _null_ ));
 DESCR("set random seed");
 
 /* OIDS 1600 - 1699 */
 
-DATA(insert OID = 1600 (  asin				PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100	dasin - _null_ ));
+DATA(insert OID = 1600 (  asin				PGNSP PGUID 12 f f t f i 1 701 "701"	dasin - _null_ ));
 DESCR("arcsine");
-DATA(insert OID = 1601 (  acos				PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100	dacos - _null_ ));
+DATA(insert OID = 1601 (  acos				PGNSP PGUID 12 f f t f i 1 701 "701"	dacos - _null_ ));
 DESCR("arccosine");
-DATA(insert OID = 1602 (  atan				PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100	datan - _null_ ));
+DATA(insert OID = 1602 (  atan				PGNSP PGUID 12 f f t f i 1 701 "701"	datan - _null_ ));
 DESCR("arctangent");
-DATA(insert OID = 1603 (  atan2				PGNSP PGUID 12 f f f t f i 2 701 "701 701" 100 0 0 100	datan2 - _null_ ));
+DATA(insert OID = 1603 (  atan2				PGNSP PGUID 12 f f t f i 2 701 "701 701"	datan2 - _null_ ));
 DESCR("arctangent, two arguments");
-DATA(insert OID = 1604 (  sin				PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100	dsin - _null_ ));
+DATA(insert OID = 1604 (  sin				PGNSP PGUID 12 f f t f i 1 701 "701"	dsin - _null_ ));
 DESCR("sine");
-DATA(insert OID = 1605 (  cos				PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100	dcos - _null_ ));
+DATA(insert OID = 1605 (  cos				PGNSP PGUID 12 f f t f i 1 701 "701"	dcos - _null_ ));
 DESCR("cosine");
-DATA(insert OID = 1606 (  tan				PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100	dtan - _null_ ));
+DATA(insert OID = 1606 (  tan				PGNSP PGUID 12 f f t f i 1 701 "701"	dtan - _null_ ));
 DESCR("tangent");
-DATA(insert OID = 1607 (  cot				PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100	dcot - _null_ ));
+DATA(insert OID = 1607 (  cot				PGNSP PGUID 12 f f t f i 1 701 "701"	dcot - _null_ ));
 DESCR("cotangent");
-DATA(insert OID = 1608 (  degrees			PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100	degrees - _null_ ));
+DATA(insert OID = 1608 (  degrees			PGNSP PGUID 12 f f t f i 1 701 "701"	degrees - _null_ ));
 DESCR("radians to degrees");
-DATA(insert OID = 1609 (  radians			PGNSP PGUID 12 f f f t f i 1 701 "701" 100 0 0 100	radians - _null_ ));
+DATA(insert OID = 1609 (  radians			PGNSP PGUID 12 f f t f i 1 701 "701"	radians - _null_ ));
 DESCR("degrees to radians");
-DATA(insert OID = 1610 (  pi				PGNSP PGUID 12 f f f t f i 0 701 "0" 100 0 0 100  dpi - _null_ ));
+DATA(insert OID = 1610 (  pi				PGNSP PGUID 12 f f t f i 0 701 "0"  dpi - _null_ ));
 DESCR("PI");
 
-DATA(insert OID = 1618 (  interval_mul		PGNSP PGUID 12 f f f t f i 2 1186 "1186 701" 100 0 0 100  interval_mul - _null_ ));
+DATA(insert OID = 1618 (  interval_mul		PGNSP PGUID 12 f f t f i 2 1186 "1186 701"  interval_mul - _null_ ));
 DESCR("multiply interval");
-DATA(insert OID = 1619 (  varchar			PGNSP PGUID 12 f f f t f i 1 1043 "23" 100 0 0 100	int4_text - _null_ ));
+DATA(insert OID = 1619 (  varchar			PGNSP PGUID 12 f f t f i 1 1043 "23"	int4_text - _null_ ));
 DESCR("convert int4 to varchar");
 
-DATA(insert OID = 1620 (  ascii				PGNSP PGUID 12 f f f t f i 1 23 "25" 100 0 0 100  ascii - _null_ ));
+DATA(insert OID = 1620 (  ascii				PGNSP PGUID 12 f f t f i 1 23 "25"  ascii - _null_ ));
 DESCR("convert first char to int4");
-DATA(insert OID = 1621 (  chr				PGNSP PGUID 12 f f f t f i 1 25 "23" 100 0 0 100  chr - _null_ ));
+DATA(insert OID = 1621 (  chr				PGNSP PGUID 12 f f t f i 1 25 "23"  chr - _null_ ));
 DESCR("convert int4 to char");
-DATA(insert OID = 1622 (  repeat			PGNSP PGUID 12 f f f t f i 2 25 "25 23" 100 0 0 100  repeat - _null_ ));
+DATA(insert OID = 1622 (  repeat			PGNSP PGUID 12 f f t f i 2 25 "25 23"  repeat - _null_ ));
 DESCR("replicate string int4 times");
 
-DATA(insert OID = 1623 (  varchar			PGNSP PGUID 12 f f f t f i 1 1043 "20" 100 0 0 100	int8_text - _null_ ));
+DATA(insert OID = 1623 (  varchar			PGNSP PGUID 12 f f t f i 1 1043 "20"	int8_text - _null_ ));
 DESCR("convert int8 to varchar");
-DATA(insert OID = 1624 (  mul_d_interval	PGNSP PGUID 12 f f f t f i 2 1186 "701 1186" 100 0 0 100  mul_d_interval - _null_ ));
+DATA(insert OID = 1624 (  mul_d_interval	PGNSP PGUID 12 f f t f i 2 1186 "701 1186"  mul_d_interval - _null_ ));
 
-DATA(insert OID = 1633 (  texticlike		PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100 texticlike - _null_ ));
+DATA(insert OID = 1633 (  texticlike		PGNSP PGUID 12 f f t f i 2 16 "25 25" texticlike - _null_ ));
 DESCR("matches LIKE expression, case-insensitive");
-DATA(insert OID = 1634 (  texticnlike		PGNSP PGUID 12 f f f t f i 2 16 "25 25" 100 0 0 100 texticnlike - _null_ ));
+DATA(insert OID = 1634 (  texticnlike		PGNSP PGUID 12 f f t f i 2 16 "25 25" texticnlike - _null_ ));
 DESCR("does not match LIKE expression, case-insensitive");
-DATA(insert OID = 1635 (  nameiclike		PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100  nameiclike - _null_ ));
+DATA(insert OID = 1635 (  nameiclike		PGNSP PGUID 12 f f t f i 2 16 "19 25"  nameiclike - _null_ ));
 DESCR("matches LIKE expression, case-insensitive");
-DATA(insert OID = 1636 (  nameicnlike		PGNSP PGUID 12 f f f t f i 2 16 "19 25" 100 0 0 100  nameicnlike - _null_ ));
+DATA(insert OID = 1636 (  nameicnlike		PGNSP PGUID 12 f f t f i 2 16 "19 25"  nameicnlike - _null_ ));
 DESCR("does not match LIKE expression, case-insensitive");
-DATA(insert OID = 1637 (  like_escape		PGNSP PGUID 12 f f f t f i 2 25 "25 25" 100 0 0 100 like_escape - _null_ ));
+DATA(insert OID = 1637 (  like_escape		PGNSP PGUID 12 f f t f i 2 25 "25 25" like_escape - _null_ ));
 DESCR("convert match pattern to use backslash escapes");
 
-DATA(insert OID = 1689 (  update_pg_pwd_and_pg_group  PGNSP PGUID 12 f f f t f v 0 0  ""  100 0 0 100  update_pg_pwd_and_pg_group - _null_ ));
+DATA(insert OID = 1689 (  update_pg_pwd_and_pg_group  PGNSP PGUID 12 f f t f v 0 0  ""   update_pg_pwd_and_pg_group - _null_ ));
 DESCR("update pg_pwd and pg_group files");
 
 /* Oracle Compatibility Related Functions - By Edmund Mergl <E.Mergl@bawue.de> */
-DATA(insert OID =  868 (  strpos	   PGNSP PGUID 12 f f f t f i 2 23 "25 25" 100 0 0 100	textpos - _null_ ));
+DATA(insert OID =  868 (  strpos	   PGNSP PGUID 12 f f t f i 2 23 "25 25"	textpos - _null_ ));
 DESCR("find position of substring");
-DATA(insert OID =  870 (  lower		   PGNSP PGUID 12 f f f t f i 1 25 "25" 100 0 0 100  lower - _null_ ));
+DATA(insert OID =  870 (  lower		   PGNSP PGUID 12 f f t f i 1 25 "25"  lower - _null_ ));
 DESCR("lowercase");
-DATA(insert OID =  871 (  upper		   PGNSP PGUID 12 f f f t f i 1 25 "25" 100 0 0 100  upper - _null_ ));
+DATA(insert OID =  871 (  upper		   PGNSP PGUID 12 f f t f i 1 25 "25"  upper - _null_ ));
 DESCR("uppercase");
-DATA(insert OID =  872 (  initcap	   PGNSP PGUID 12 f f f t f i 1 25 "25" 100 0 0 100  initcap - _null_ ));
+DATA(insert OID =  872 (  initcap	   PGNSP PGUID 12 f f t f i 1 25 "25"  initcap - _null_ ));
 DESCR("capitalize each word");
-DATA(insert OID =  873 (  lpad		   PGNSP PGUID 12 f f f t f i 3 25 "25 23 25" 100 0 0 100  lpad - _null_ ));
+DATA(insert OID =  873 (  lpad		   PGNSP PGUID 12 f f t f i 3 25 "25 23 25"  lpad - _null_ ));
 DESCR("left-pad string to length");
-DATA(insert OID =  874 (  rpad		   PGNSP PGUID 12 f f f t f i 3 25 "25 23 25" 100 0 0 100  rpad - _null_ ));
+DATA(insert OID =  874 (  rpad		   PGNSP PGUID 12 f f t f i 3 25 "25 23 25"  rpad - _null_ ));
 DESCR("right-pad string to length");
-DATA(insert OID =  875 (  ltrim		   PGNSP PGUID 12 f f f t f i 2 25 "25 25" 100 0 0 100	ltrim - _null_ ));
+DATA(insert OID =  875 (  ltrim		   PGNSP PGUID 12 f f t f i 2 25 "25 25"	ltrim - _null_ ));
 DESCR("left-pad string to length");
-DATA(insert OID =  876 (  rtrim		   PGNSP PGUID 12 f f f t f i 2 25 "25 25" 100 0 0 100	rtrim - _null_ ));
+DATA(insert OID =  876 (  rtrim		   PGNSP PGUID 12 f f t f i 2 25 "25 25"	rtrim - _null_ ));
 DESCR("right-pad string to length");
-DATA(insert OID =  877 (  substr	   PGNSP PGUID 12 f f f t f i 3 25 "25 23 23" 100 0 0 100  text_substr - _null_ ));
+DATA(insert OID =  877 (  substr	   PGNSP PGUID 12 f f t f i 3 25 "25 23 23"  text_substr - _null_ ));
 DESCR("return portion of string");
-DATA(insert OID =  878 (  translate    PGNSP PGUID 12 f f f t f i 3 25 "25 25 25" 100 0 0 100  translate - _null_ ));
+DATA(insert OID =  878 (  translate    PGNSP PGUID 12 f f t f i 3 25 "25 25 25"  translate - _null_ ));
 DESCR("map a set of character appearing in string");
-DATA(insert OID =  879 (  lpad		   PGNSP PGUID 14 f f f t f i 2 25 "25 23" 100 0 0 100	"select lpad($1, $2, \' \')" - _null_ ));
+DATA(insert OID =  879 (  lpad		   PGNSP PGUID 14 f f t f i 2 25 "25 23"	"select lpad($1, $2, \' \')" - _null_ ));
 DESCR("left-pad string to length");
-DATA(insert OID =  880 (  rpad		   PGNSP PGUID 14 f f f t f i 2 25 "25 23" 100 0 0 100	"select rpad($1, $2, \' \')" - _null_ ));
+DATA(insert OID =  880 (  rpad		   PGNSP PGUID 14 f f t f i 2 25 "25 23"	"select rpad($1, $2, \' \')" - _null_ ));
 DESCR("right-pad string to length");
-DATA(insert OID =  881 (  ltrim		   PGNSP PGUID 14 f f f t f i 1 25 "25" 100 0 0 100  "select ltrim($1, \' \')" - _null_ ));
+DATA(insert OID =  881 (  ltrim		   PGNSP PGUID 14 f f t f i 1 25 "25"  "select ltrim($1, \' \')" - _null_ ));
 DESCR("remove initial characters from string");
-DATA(insert OID =  882 (  rtrim		   PGNSP PGUID 14 f f f t f i 1 25 "25" 100 0 0 100  "select rtrim($1, \' \')" - _null_ ));
+DATA(insert OID =  882 (  rtrim		   PGNSP PGUID 14 f f t f i 1 25 "25"  "select rtrim($1, \' \')" - _null_ ));
 DESCR("remove trailing characters from string");
-DATA(insert OID =  883 (  substr	   PGNSP PGUID 14 f f f t f i 2 25 "25 23" 100 0 0 100	"select substr($1, $2, -1)" - _null_ ));
+DATA(insert OID =  883 (  substr	   PGNSP PGUID 14 f f t f i 2 25 "25 23"	"select substr($1, $2, -1)" - _null_ ));
 DESCR("return portion of string");
-DATA(insert OID =  884 (  btrim		   PGNSP PGUID 12 f f f t f i 2 25 "25 25" 100 0 0 100	btrim - _null_ ));
+DATA(insert OID =  884 (  btrim		   PGNSP PGUID 12 f f t f i 2 25 "25 25"	btrim - _null_ ));
 DESCR("trim both ends of string");
-DATA(insert OID =  885 (  btrim		   PGNSP PGUID 14 f f f t f i 1 25 "25" 100 0 0 100  "select btrim($1, \' \')" - _null_ ));
+DATA(insert OID =  885 (  btrim		   PGNSP PGUID 14 f f t f i 1 25 "25"  "select btrim($1, \' \')" - _null_ ));
 DESCR("trim both ends of string");
 
-DATA(insert OID =  936 (  substring    PGNSP PGUID 12 f f f t f i 3 25 "25 23 23" 100 0 0 100  text_substr - _null_ ));
+DATA(insert OID =  936 (  substring    PGNSP PGUID 12 f f t f i 3 25 "25 23 23"  text_substr - _null_ ));
 DESCR("return portion of string");
-DATA(insert OID =  937 (  substring    PGNSP PGUID 14 f f f t f i 2 25 "25 23" 100 0 0 100	"select substring($1, $2, -1)" - _null_ ));
+DATA(insert OID =  937 (  substring    PGNSP PGUID 14 f f t f i 2 25 "25 23"	"select substring($1, $2, -1)" - _null_ ));
 DESCR("return portion of string");
 
 /* for multi-byte support */
 
 /* return database encoding name */
-DATA(insert OID = 1039 (  getdatabaseencoding	   PGNSP PGUID 12 f f f t f s 0 19 "0" 100 0 0 100	getdatabaseencoding - _null_ ));
+DATA(insert OID = 1039 (  getdatabaseencoding	   PGNSP PGUID 12 f f t f s 0 19 "0"	getdatabaseencoding - _null_ ));
 DESCR("encoding name of current database");
 
 /* return client encoding name i.e. session encoding */
-DATA(insert OID = 810 (  pg_client_encoding    PGNSP PGUID 12 f f f t f s 0 19 "0" 100 0 0 100	pg_client_encoding - _null_ ));
+DATA(insert OID = 810 (  pg_client_encoding    PGNSP PGUID 12 f f t f s 0 19 "0"	pg_client_encoding - _null_ ));
 DESCR("encoding name of current database");
 
-DATA(insert OID = 1717 (  convert		   PGNSP PGUID 12 f f f t f s 2 25 "25 19" 100 0 0 100	pg_convert - _null_ ));
+DATA(insert OID = 1717 (  convert		   PGNSP PGUID 12 f f t f s 2 25 "25 19"	pg_convert - _null_ ));
 DESCR("convert string with specified destination encoding name");
 
-DATA(insert OID = 1813 (  convert		   PGNSP PGUID 12 f f f t f s 3 25 "25 19 19" 100 0 0 100  pg_convert2 - _null_ ));
+DATA(insert OID = 1813 (  convert		   PGNSP PGUID 12 f f t f s 3 25 "25 19 19"  pg_convert2 - _null_ ));
 DESCR("convert string with specified encoding names");
 
-DATA(insert OID = 1264 (  pg_char_to_encoding	   PGNSP PGUID 12 f f f t f s 1 23 "19" 100 0 0 100  PG_char_to_encoding - _null_ ));
+DATA(insert OID = 1264 (  pg_char_to_encoding	   PGNSP PGUID 12 f f t f s 1 23 "19"  PG_char_to_encoding - _null_ ));
 DESCR("convert encoding name to encoding id");
 
-DATA(insert OID = 1597 (  pg_encoding_to_char	   PGNSP PGUID 12 f f f t f s 1 19 "23" 100 0 0 100  PG_encoding_to_char - _null_ ));
+DATA(insert OID = 1597 (  pg_encoding_to_char	   PGNSP PGUID 12 f f t f s 1 19 "23"  PG_encoding_to_char - _null_ ));
 DESCR("convert encoding id to encoding name");
 
-DATA(insert OID = 1638 (  oidgt				   PGNSP PGUID 12 f f f t f i 2 16 "26 26" 100 0 0 100	oidgt - _null_ ));
+DATA(insert OID = 1638 (  oidgt				   PGNSP PGUID 12 f f t f i 2 16 "26 26"	oidgt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1639 (  oidge				   PGNSP PGUID 12 f f f t f i 2 16 "26 26" 100 0 0 100	oidge - _null_ ));
+DATA(insert OID = 1639 (  oidge				   PGNSP PGUID 12 f f t f i 2 16 "26 26"	oidge - _null_ ));
 DESCR("greater-than-or-equal");
 
 /* System-view support functions */
-DATA(insert OID = 1573 (  pg_get_ruledef	   PGNSP PGUID 12 f f f t f s 1 25 "26" 100 0 0 100  pg_get_ruledef - _null_ ));
+DATA(insert OID = 1573 (  pg_get_ruledef	   PGNSP PGUID 12 f f t f s 1 25 "26"  pg_get_ruledef - _null_ ));
 DESCR("source text of a rule");
-DATA(insert OID = 1640 (  pg_get_viewdef	   PGNSP PGUID 12 f f f t f s 1 25 "25" 100 0 0 100  pg_get_viewdef_name - _null_ ));
+DATA(insert OID = 1640 (  pg_get_viewdef	   PGNSP PGUID 12 f f t f s 1 25 "25"  pg_get_viewdef_name - _null_ ));
 DESCR("select statement of a view");
-DATA(insert OID = 1641 (  pg_get_viewdef	   PGNSP PGUID 12 f f f t f s 1 25 "26" 100 0 0 100  pg_get_viewdef - _null_ ));
+DATA(insert OID = 1641 (  pg_get_viewdef	   PGNSP PGUID 12 f f t f s 1 25 "26"  pg_get_viewdef - _null_ ));
 DESCR("select statement of a view");
-DATA(insert OID = 1642 (  pg_get_userbyid	   PGNSP PGUID 12 f f f t f s 1 19 "23" 100 0 0 100  pg_get_userbyid - _null_ ));
+DATA(insert OID = 1642 (  pg_get_userbyid	   PGNSP PGUID 12 f f t f s 1 19 "23"  pg_get_userbyid - _null_ ));
 DESCR("user name by UID (with fallback)");
-DATA(insert OID = 1643 (  pg_get_indexdef	   PGNSP PGUID 12 f f f t f s 1 25 "26" 100 0 0 100  pg_get_indexdef - _null_ ));
+DATA(insert OID = 1643 (  pg_get_indexdef	   PGNSP PGUID 12 f f t f s 1 25 "26"  pg_get_indexdef - _null_ ));
 DESCR("index description");
-DATA(insert OID = 1716 (  pg_get_expr		   PGNSP PGUID 12 f f f t f s 2 25 "25 26" 100 0 0 100	pg_get_expr - _null_ ));
+DATA(insert OID = 1716 (  pg_get_expr		   PGNSP PGUID 12 f f t f s 2 25 "25 26"	pg_get_expr - _null_ ));
 DESCR("deparse an encoded expression");
 
 
 /* Generic referential integrity constraint triggers */
-DATA(insert OID = 1644 (  RI_FKey_check_ins		PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_check_ins - _null_ ));
+DATA(insert OID = 1644 (  RI_FKey_check_ins		PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_check_ins - _null_ ));
 DESCR("referential integrity FOREIGN KEY ... REFERENCES");
-DATA(insert OID = 1645 (  RI_FKey_check_upd		PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_check_upd - _null_ ));
+DATA(insert OID = 1645 (  RI_FKey_check_upd		PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_check_upd - _null_ ));
 DESCR("referential integrity FOREIGN KEY ... REFERENCES");
-DATA(insert OID = 1646 (  RI_FKey_cascade_del	PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_cascade_del - _null_ ));
+DATA(insert OID = 1646 (  RI_FKey_cascade_del	PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_cascade_del - _null_ ));
 DESCR("referential integrity ON DELETE CASCADE");
-DATA(insert OID = 1647 (  RI_FKey_cascade_upd	PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_cascade_upd - _null_ ));
+DATA(insert OID = 1647 (  RI_FKey_cascade_upd	PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_cascade_upd - _null_ ));
 DESCR("referential integrity ON UPDATE CASCADE");
-DATA(insert OID = 1648 (  RI_FKey_restrict_del	PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_restrict_del - _null_ ));
+DATA(insert OID = 1648 (  RI_FKey_restrict_del	PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_restrict_del - _null_ ));
 DESCR("referential integrity ON DELETE RESTRICT");
-DATA(insert OID = 1649 (  RI_FKey_restrict_upd	PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_restrict_upd - _null_ ));
+DATA(insert OID = 1649 (  RI_FKey_restrict_upd	PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_restrict_upd - _null_ ));
 DESCR("referential integrity ON UPDATE RESTRICT");
-DATA(insert OID = 1650 (  RI_FKey_setnull_del	PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_setnull_del - _null_ ));
+DATA(insert OID = 1650 (  RI_FKey_setnull_del	PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_setnull_del - _null_ ));
 DESCR("referential integrity ON DELETE SET NULL");
-DATA(insert OID = 1651 (  RI_FKey_setnull_upd	PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_setnull_upd - _null_ ));
+DATA(insert OID = 1651 (  RI_FKey_setnull_upd	PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_setnull_upd - _null_ ));
 DESCR("referential integrity ON UPDATE SET NULL");
-DATA(insert OID = 1652 (  RI_FKey_setdefault_del PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100	RI_FKey_setdefault_del - _null_ ));
+DATA(insert OID = 1652 (  RI_FKey_setdefault_del PGNSP PGUID 12 f f t f v 0 0 ""	RI_FKey_setdefault_del - _null_ ));
 DESCR("referential integrity ON DELETE SET DEFAULT");
-DATA(insert OID = 1653 (  RI_FKey_setdefault_upd PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100	RI_FKey_setdefault_upd - _null_ ));
+DATA(insert OID = 1653 (  RI_FKey_setdefault_upd PGNSP PGUID 12 f f t f v 0 0 ""	RI_FKey_setdefault_upd - _null_ ));
 DESCR("referential integrity ON UPDATE SET DEFAULT");
-DATA(insert OID = 1654 (  RI_FKey_noaction_del PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_noaction_del - _null_ ));
+DATA(insert OID = 1654 (  RI_FKey_noaction_del PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_noaction_del - _null_ ));
 DESCR("referential integrity ON DELETE NO ACTION");
-DATA(insert OID = 1655 (  RI_FKey_noaction_upd PGNSP PGUID 12 f f f t f v 0 0 "" 100 0 0 100  RI_FKey_noaction_upd - _null_ ));
+DATA(insert OID = 1655 (  RI_FKey_noaction_upd PGNSP PGUID 12 f f t f v 0 0 ""  RI_FKey_noaction_upd - _null_ ));
 DESCR("referential integrity ON UPDATE NO ACTION");
 
-DATA(insert OID = 1666 (  varbiteq			PGNSP PGUID 12 f f f t f i 2 16 "1562 1562" 100 0 0 100  biteq - _null_ ));
+DATA(insert OID = 1666 (  varbiteq			PGNSP PGUID 12 f f t f i 2 16 "1562 1562"  biteq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1667 (  varbitne			PGNSP PGUID 12 f f f t f i 2 16 "1562 1562" 100 0 0 100  bitne - _null_ ));
+DATA(insert OID = 1667 (  varbitne			PGNSP PGUID 12 f f t f i 2 16 "1562 1562"  bitne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1668 (  varbitge			PGNSP PGUID 12 f f f t f i 2 16 "1562 1562" 100 0 0 100  bitge - _null_ ));
+DATA(insert OID = 1668 (  varbitge			PGNSP PGUID 12 f f t f i 2 16 "1562 1562"  bitge - _null_ ));
 DESCR("greater than or equal");
-DATA(insert OID = 1669 (  varbitgt			PGNSP PGUID 12 f f f t f i 2 16 "1562 1562" 100 0 0 100  bitgt - _null_ ));
+DATA(insert OID = 1669 (  varbitgt			PGNSP PGUID 12 f f t f i 2 16 "1562 1562"  bitgt - _null_ ));
 DESCR("greater than");
-DATA(insert OID = 1670 (  varbitle			PGNSP PGUID 12 f f f t f i 2 16 "1562 1562" 100 0 0 100  bitle - _null_ ));
+DATA(insert OID = 1670 (  varbitle			PGNSP PGUID 12 f f t f i 2 16 "1562 1562"  bitle - _null_ ));
 DESCR("less than or equal");
-DATA(insert OID = 1671 (  varbitlt			PGNSP PGUID 12 f f f t f i 2 16 "1562 1562" 100 0 0 100  bitlt - _null_ ));
+DATA(insert OID = 1671 (  varbitlt			PGNSP PGUID 12 f f t f i 2 16 "1562 1562"  bitlt - _null_ ));
 DESCR("less than");
-DATA(insert OID = 1672 (  varbitcmp			PGNSP PGUID 12 f f f t f i 2 23 "1562 1562" 100 0 0 100  bitcmp - _null_ ));
+DATA(insert OID = 1672 (  varbitcmp			PGNSP PGUID 12 f f t f i 2 23 "1562 1562"  bitcmp - _null_ ));
 DESCR("compare");
 
-DATA(insert OID = 1673 (  bitand			PGNSP PGUID 12 f f f t f i 2 1560 "1560 1560" 100 0 0 100  bitand - _null_ ));
+DATA(insert OID = 1673 (  bitand			PGNSP PGUID 12 f f t f i 2 1560 "1560 1560"  bitand - _null_ ));
 DESCR("bitwise and");
-DATA(insert OID = 1674 (  bitor				PGNSP PGUID 12 f f f t f i 2 1560 "1560 1560" 100 0 0 100  bitor - _null_ ));
+DATA(insert OID = 1674 (  bitor				PGNSP PGUID 12 f f t f i 2 1560 "1560 1560"  bitor - _null_ ));
 DESCR("bitwise or");
-DATA(insert OID = 1675 (  bitxor			PGNSP PGUID 12 f f f t f i 2 1560 "1560 1560" 100 0 0 100  bitxor - _null_ ));
+DATA(insert OID = 1675 (  bitxor			PGNSP PGUID 12 f f t f i 2 1560 "1560 1560"  bitxor - _null_ ));
 DESCR("bitwise exclusive or");
-DATA(insert OID = 1676 (  bitnot			PGNSP PGUID 12 f f f t f i 1 1560 "1560" 100 0 0 100  bitnot - _null_ ));
+DATA(insert OID = 1676 (  bitnot			PGNSP PGUID 12 f f t f i 1 1560 "1560"  bitnot - _null_ ));
 DESCR("bitwise negation");
-DATA(insert OID = 1677 (  bitshiftleft		PGNSP PGUID 12 f f f t f i 2 1560 "1560 23" 100 0 0 100  bitshiftleft - _null_ ));
+DATA(insert OID = 1677 (  bitshiftleft		PGNSP PGUID 12 f f t f i 2 1560 "1560 23"  bitshiftleft - _null_ ));
 DESCR("bitwise left shift");
-DATA(insert OID = 1678 (  bitshiftright		PGNSP PGUID 12 f f f t f i 2 1560 "1560 23" 100 0 0 100  bitshiftright - _null_ ));
+DATA(insert OID = 1678 (  bitshiftright		PGNSP PGUID 12 f f t f i 2 1560 "1560 23"  bitshiftright - _null_ ));
 DESCR("bitwise right shift");
-DATA(insert OID = 1679 (  bitcat			PGNSP PGUID 12 f f f t f i 2 1560 "1560 1560" 100 0 0 100  bitcat - _null_ ));
+DATA(insert OID = 1679 (  bitcat			PGNSP PGUID 12 f f t f i 2 1560 "1560 1560"  bitcat - _null_ ));
 DESCR("bitwise concatenation");
-DATA(insert OID = 1680 (  substring			PGNSP PGUID 12 f f f t f i 3 1560 "1560 23 23" 100 0 0 100	bitsubstr - _null_ ));
+DATA(insert OID = 1680 (  substring			PGNSP PGUID 12 f f t f i 3 1560 "1560 23 23"	bitsubstr - _null_ ));
 DESCR("return portion of bitstring");
-DATA(insert OID = 1681 (  length			PGNSP PGUID 12 f f f t f i 1 23 "1560" 100 0 0 100	bitlength - _null_ ));
+DATA(insert OID = 1681 (  length			PGNSP PGUID 12 f f t f i 1 23 "1560"	bitlength - _null_ ));
 DESCR("bitstring length");
-DATA(insert OID = 1682 (  octet_length		PGNSP PGUID 12 f f f t f i 1 23 "1560" 100 0 0 100	bitoctetlength - _null_ ));
+DATA(insert OID = 1682 (  octet_length		PGNSP PGUID 12 f f t f i 1 23 "1560"	bitoctetlength - _null_ ));
 DESCR("octet length");
-DATA(insert OID = 1683 (  bitfromint4		PGNSP PGUID 12 f f f t f i 1 1560 "23" 100 0 0 100	bitfromint4 - _null_ ));
+DATA(insert OID = 1683 (  bitfromint4		PGNSP PGUID 12 f f t f i 1 1560 "23"	bitfromint4 - _null_ ));
 DESCR("int4 to bitstring");
-DATA(insert OID = 1684 (  bittoint4			PGNSP PGUID 12 f f f t f i 1 23 "1560" 100 0 0 100	bittoint4 - _null_ ));
+DATA(insert OID = 1684 (  bittoint4			PGNSP PGUID 12 f f t f i 1 23 "1560"	bittoint4 - _null_ ));
 DESCR("bitstring to int4");
 
-DATA(insert OID = 1685 (  bit			   PGNSP PGUID 12 f f t t f i 2 1560 "1560 23" 100 0 0 100	bit - _null_ ));
+DATA(insert OID = 1685 (  bit			   PGNSP PGUID 12 f f t f i 2 1560 "1560 23"	bit - _null_ ));
 DESCR("adjust bit() to typmod length");
-DATA(insert OID = 1686 (  _bit			   PGNSP PGUID 12 f f t t f i 2 1561 "1561 23" 100 0 0 100	_bit - _null_ ));
+DATA(insert OID = 1686 (  _bit			   PGNSP PGUID 12 f f t f i 2 1561 "1561 23"	_bit - _null_ ));
 DESCR("adjust bit()[] to typmod length");
-DATA(insert OID = 1687 (  varbit		   PGNSP PGUID 12 f f t t f i 2 1562 "1562 23" 100 0 0 100	varbit - _null_ ));
+DATA(insert OID = 1687 (  varbit		   PGNSP PGUID 12 f f t f i 2 1562 "1562 23"	varbit - _null_ ));
 DESCR("adjust varbit() to typmod length");
-DATA(insert OID = 1688 (  _varbit		   PGNSP PGUID 12 f f t t f i 2 1563 "1563 23" 100 0 0 100	_varbit - _null_ ));
+DATA(insert OID = 1688 (  _varbit		   PGNSP PGUID 12 f f t f i 2 1563 "1563 23"	_varbit - _null_ ));
 DESCR("adjust varbit()[] to typmod length");
 
-DATA(insert OID = 1698 (  position		   PGNSP PGUID 12 f f f t f i 2 23 "1560 1560" 100 0 0 100 bitposition - _null_ ));
+DATA(insert OID = 1698 (  position		   PGNSP PGUID 12 f f t f i 2 23 "1560 1560" bitposition - _null_ ));
 DESCR("return position of sub-bitstring");
-DATA(insert OID = 1699 (  substring			PGNSP PGUID 14 f f f t f i 2 1560 "1560 23" 100 0 0 100  "select substring($1, $2, -1)" - _null_ ));
+DATA(insert OID = 1699 (  substring			PGNSP PGUID 14 f f t f i 2 1560 "1560 23"  "select substring($1, $2, -1)" - _null_ ));
 DESCR("return portion of bitstring");
 
 
 /* for mac type support */
-DATA(insert OID = 436 (  macaddr_in			PGNSP PGUID 12 f f f t f i 1 829 "0" 100 0 0 100  macaddr_in - _null_ ));
+DATA(insert OID = 436 (  macaddr_in			PGNSP PGUID 12 f f t f i 1 829 "0"  macaddr_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 437 (  macaddr_out		PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100  macaddr_out - _null_ ));
+DATA(insert OID = 437 (  macaddr_out		PGNSP PGUID 12 f f t f i 1 23 "0"  macaddr_out - _null_ ));
 DESCR("(internal)");
 
-DATA(insert OID = 752 (  text				PGNSP PGUID 12 f f f t f i 1 25 "829" 100 0 0 100  macaddr_text - _null_ ));
+DATA(insert OID = 752 (  text				PGNSP PGUID 12 f f t f i 1 25 "829"  macaddr_text - _null_ ));
 DESCR("MAC address to text");
-DATA(insert OID = 753 (  trunc				PGNSP PGUID 12 f f f t f i 1 829 "829" 100 0 0 100	macaddr_trunc - _null_ ));
+DATA(insert OID = 753 (  trunc				PGNSP PGUID 12 f f t f i 1 829 "829"	macaddr_trunc - _null_ ));
 DESCR("MAC manufacturer fields");
-DATA(insert OID = 767 (  macaddr			PGNSP PGUID 12 f f f t f i 1 829 "25" 100 0 0 100  text_macaddr - _null_ ));
+DATA(insert OID = 767 (  macaddr			PGNSP PGUID 12 f f t f i 1 829 "25"  text_macaddr - _null_ ));
 DESCR("text to MAC address");
 
-DATA(insert OID = 830 (  macaddr_eq			PGNSP PGUID 12 f f f t f i 2 16 "829 829" 100 0 0 100  macaddr_eq - _null_ ));
+DATA(insert OID = 830 (  macaddr_eq			PGNSP PGUID 12 f f t f i 2 16 "829 829"  macaddr_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 831 (  macaddr_lt			PGNSP PGUID 12 f f f t f i 2 16 "829 829" 100 0 0 100  macaddr_lt - _null_ ));
+DATA(insert OID = 831 (  macaddr_lt			PGNSP PGUID 12 f f t f i 2 16 "829 829"  macaddr_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 832 (  macaddr_le			PGNSP PGUID 12 f f f t f i 2 16 "829 829" 100 0 0 100  macaddr_le - _null_ ));
+DATA(insert OID = 832 (  macaddr_le			PGNSP PGUID 12 f f t f i 2 16 "829 829"  macaddr_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 833 (  macaddr_gt			PGNSP PGUID 12 f f f t f i 2 16 "829 829" 100 0 0 100  macaddr_gt - _null_ ));
+DATA(insert OID = 833 (  macaddr_gt			PGNSP PGUID 12 f f t f i 2 16 "829 829"  macaddr_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 834 (  macaddr_ge			PGNSP PGUID 12 f f f t f i 2 16 "829 829" 100 0 0 100  macaddr_ge - _null_ ));
+DATA(insert OID = 834 (  macaddr_ge			PGNSP PGUID 12 f f t f i 2 16 "829 829"  macaddr_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 835 (  macaddr_ne			PGNSP PGUID 12 f f f t f i 2 16 "829 829" 100 0 0 100  macaddr_ne - _null_ ));
+DATA(insert OID = 835 (  macaddr_ne			PGNSP PGUID 12 f f t f i 2 16 "829 829"  macaddr_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 836 (  macaddr_cmp		PGNSP PGUID 12 f f f t f i 2 23 "829 829" 100 0 0 100  macaddr_cmp - _null_ ));
+DATA(insert OID = 836 (  macaddr_cmp		PGNSP PGUID 12 f f t f i 2 23 "829 829"  macaddr_cmp - _null_ ));
 DESCR("less-equal-greater");
 
 /* for inet type support */
-DATA(insert OID = 910 (  inet_in			PGNSP PGUID 12 f f f t f i 1 869 "0" 100 0 0 100  inet_in - _null_ ));
+DATA(insert OID = 910 (  inet_in			PGNSP PGUID 12 f f t f i 1 869 "0"  inet_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 911 (  inet_out			PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100  inet_out - _null_ ));
+DATA(insert OID = 911 (  inet_out			PGNSP PGUID 12 f f t f i 1 23 "0"  inet_out - _null_ ));
 DESCR("(internal)");
 
 /* for cidr type support */
-DATA(insert OID = 1267 (  cidr_in			PGNSP PGUID 12 f f f t f i 1 650 "0" 100 0 0 100  cidr_in - _null_ ));
+DATA(insert OID = 1267 (  cidr_in			PGNSP PGUID 12 f f t f i 1 650 "0"  cidr_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1427 (  cidr_out			PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100  cidr_out - _null_ ));
+DATA(insert OID = 1427 (  cidr_out			PGNSP PGUID 12 f f t f i 1 23 "0"  cidr_out - _null_ ));
 DESCR("(internal)");
 
 /* these are used for both inet and cidr */
-DATA(insert OID = 920 (  network_eq			PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_eq - _null_ ));
+DATA(insert OID = 920 (  network_eq			PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 921 (  network_lt			PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_lt - _null_ ));
+DATA(insert OID = 921 (  network_lt			PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 922 (  network_le			PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_le - _null_ ));
+DATA(insert OID = 922 (  network_le			PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 923 (  network_gt			PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_gt - _null_ ));
+DATA(insert OID = 923 (  network_gt			PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 924 (  network_ge			PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_ge - _null_ ));
+DATA(insert OID = 924 (  network_ge			PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 925 (  network_ne			PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_ne - _null_ ));
+DATA(insert OID = 925 (  network_ne			PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 926 (  network_cmp		PGNSP PGUID 12 f f f t f i 2 23 "869 869" 100 0 0 100  network_cmp - _null_ ));
+DATA(insert OID = 926 (  network_cmp		PGNSP PGUID 12 f f t f i 2 23 "869 869"  network_cmp - _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 927 (  network_sub		PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_sub - _null_ ));
+DATA(insert OID = 927 (  network_sub		PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_sub - _null_ ));
 DESCR("is-subnet");
-DATA(insert OID = 928 (  network_subeq		PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_subeq - _null_ ));
+DATA(insert OID = 928 (  network_subeq		PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_subeq - _null_ ));
 DESCR("is-subnet-or-equal");
-DATA(insert OID = 929 (  network_sup		PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_sup - _null_ ));
+DATA(insert OID = 929 (  network_sup		PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_sup - _null_ ));
 DESCR("is-supernet");
-DATA(insert OID = 930 (  network_supeq		PGNSP PGUID 12 f f f t f i 2 16 "869 869" 100 0 0 100  network_supeq - _null_ ));
+DATA(insert OID = 930 (  network_supeq		PGNSP PGUID 12 f f t f i 2 16 "869 869"  network_supeq - _null_ ));
 DESCR("is-supernet-or-equal");
 
 /* inet/cidr functions */
-DATA(insert OID = 605 (  abbrev				PGNSP PGUID 12 f f f t f i 1 25 "869" 100 0 0 100  network_abbrev - _null_ ));
+DATA(insert OID = 605 (  abbrev				PGNSP PGUID 12 f f t f i 1 25 "869"  network_abbrev - _null_ ));
 DESCR("abbreviated display of inet/cidr value");
-DATA(insert OID = 683 (  network			PGNSP PGUID 12 f f f t f i 1 650 "869" 100 0 0 100	network_network - _null_ ));
+DATA(insert OID = 683 (  network			PGNSP PGUID 12 f f t f i 1 650 "869"	network_network - _null_ ));
 DESCR("network part of address");
-DATA(insert OID = 696 (  netmask			PGNSP PGUID 12 f f f t f i 1 869 "869" 100 0 0 100	network_netmask - _null_ ));
+DATA(insert OID = 696 (  netmask			PGNSP PGUID 12 f f t f i 1 869 "869"	network_netmask - _null_ ));
 DESCR("netmask of address");
-DATA(insert OID = 697 (  masklen			PGNSP PGUID 12 f f f t f i 1 23 "869" 100 0 0 100  network_masklen - _null_ ));
+DATA(insert OID = 697 (  masklen			PGNSP PGUID 12 f f t f i 1 23 "869"  network_masklen - _null_ ));
 DESCR("netmask length");
-DATA(insert OID = 698 (  broadcast			PGNSP PGUID 12 f f f t f i 1 869 "869" 100 0 0 100	network_broadcast - _null_ ));
+DATA(insert OID = 698 (  broadcast			PGNSP PGUID 12 f f t f i 1 869 "869"	network_broadcast - _null_ ));
 DESCR("broadcast address of network");
-DATA(insert OID = 699 (  host				PGNSP PGUID 12 f f f t f i 1 25 "869" 100 0 0 100  network_host - _null_ ));
+DATA(insert OID = 699 (  host				PGNSP PGUID 12 f f t f i 1 25 "869"  network_host - _null_ ));
 DESCR("show address octets only");
-DATA(insert OID = 730 (  text				PGNSP PGUID 12 f f f t f i 1 25 "869" 100 0 0 100  network_show - _null_ ));
+DATA(insert OID = 730 (  text				PGNSP PGUID 12 f f t f i 1 25 "869"  network_show - _null_ ));
 DESCR("show all parts of inet/cidr value");
-DATA(insert OID = 1713 (  inet				PGNSP PGUID 12 f f f t f i 1 869 "25" 100 0 0 100  text_inet - _null_ ));
+DATA(insert OID = 1713 (  inet				PGNSP PGUID 12 f f t f i 1 869 "25"  text_inet - _null_ ));
 DESCR("text to inet");
-DATA(insert OID = 1714 (  cidr				PGNSP PGUID 12 f f f t f i 1 650 "25" 100 0 0 100  text_cidr - _null_ ));
+DATA(insert OID = 1714 (  cidr				PGNSP PGUID 12 f f t f i 1 650 "25"  text_cidr - _null_ ));
 DESCR("text to cidr");
-DATA(insert OID = 1715 (  set_masklen		PGNSP PGUID 12 f f f t f i 2 869 "869 23" 100 0 0 100  inet_set_masklen - _null_ ));
+DATA(insert OID = 1715 (  set_masklen		PGNSP PGUID 12 f f t f i 2 869 "869 23"  inet_set_masklen - _null_ ));
 DESCR("change the netmask of an inet");
 
-DATA(insert OID = 1690 ( time_mi_time		PGNSP PGUID 12 f f f t f i 2 1186 "1083 1083" 100 0 0 100  time_mi_time - _null_ ));
+DATA(insert OID = 1690 ( time_mi_time		PGNSP PGUID 12 f f t f i 2 1186 "1083 1083"  time_mi_time - _null_ ));
 DESCR("minus");
 
-DATA(insert OID =  1691 (  boolle			PGNSP PGUID 12 f f f t f i 2 16 "16 16" 100 0 0 100  boolle - _null_ ));
+DATA(insert OID =  1691 (  boolle			PGNSP PGUID 12 f f t f i 2 16 "16 16"  boolle - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  1692 (  boolge			PGNSP PGUID 12 f f f t f i 2 16 "16 16" 100 0 0 100  boolge - _null_ ));
+DATA(insert OID =  1692 (  boolge			PGNSP PGUID 12 f f t f i 2 16 "16 16"  boolge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1693 (  btboolcmp			PGNSP PGUID 12 f f f t f i 2 23 "16 16" 100 0 0 100  btboolcmp - _null_ ));
+DATA(insert OID = 1693 (  btboolcmp			PGNSP PGUID 12 f f t f i 2 23 "16 16"  btboolcmp - _null_ ));
 DESCR("btree less-equal-greater");
 
-DATA(insert OID = 1696 (  timetz_hash		PGNSP PGUID 12 f f f t f i 1 23 "1266" 100 0 0 100	timetz_hash - _null_ ));
+DATA(insert OID = 1696 (  timetz_hash		PGNSP PGUID 12 f f t f i 1 23 "1266"	timetz_hash - _null_ ));
 DESCR("hash");
-DATA(insert OID = 1697 (  interval_hash		PGNSP PGUID 12 f f f t f i 1 23 "1186" 100 0 0 100	interval_hash - _null_ ));
+DATA(insert OID = 1697 (  interval_hash		PGNSP PGUID 12 f f t f i 1 23 "1186"	interval_hash - _null_ ));
 DESCR("hash");
 
 
 /* OID's 1700 - 1799 NUMERIC data type */
-DATA(insert OID = 1701 ( numeric_in				PGNSP PGUID 12 f f f t f i 3 1700 "0 26 23" 100 0 0 100  numeric_in - _null_ ));
+DATA(insert OID = 1701 ( numeric_in				PGNSP PGUID 12 f f t f i 3 1700 "0 26 23"  numeric_in - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1702 ( numeric_out			PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100  numeric_out - _null_ ));
+DATA(insert OID = 1702 ( numeric_out			PGNSP PGUID 12 f f t f i 1 23 "0"  numeric_out - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1703 ( numeric				PGNSP PGUID 12 f f t t f i 2 1700 "1700 23" 100 0 0 100  numeric - _null_ ));
+DATA(insert OID = 1703 ( numeric				PGNSP PGUID 12 f f t f i 2 1700 "1700 23"  numeric - _null_ ));
 DESCR("adjust numeric to typmod precision/scale");
-DATA(insert OID = 1704 ( numeric_abs			PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_abs - _null_ ));
+DATA(insert OID = 1704 ( numeric_abs			PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_abs - _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1705 ( abs					PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_abs - _null_ ));
+DATA(insert OID = 1705 ( abs					PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_abs - _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1706 ( sign					PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_sign - _null_ ));
+DATA(insert OID = 1706 ( sign					PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_sign - _null_ ));
 DESCR("sign of value");
-DATA(insert OID = 1707 ( round					PGNSP PGUID 12 f f f t f i 2 1700 "1700 23" 100 0 0 100  numeric_round - _null_ ));
+DATA(insert OID = 1707 ( round					PGNSP PGUID 12 f f t f i 2 1700 "1700 23"  numeric_round - _null_ ));
 DESCR("value rounded to 'scale'");
-DATA(insert OID = 1708 ( round					PGNSP PGUID 14 f f f t f i 1 1700 "1700" 100 0 0 100  "select round($1,0)" - _null_ ));
+DATA(insert OID = 1708 ( round					PGNSP PGUID 14 f f t f i 1 1700 "1700"  "select round($1,0)" - _null_ ));
 DESCR("value rounded to 'scale' of zero");
-DATA(insert OID = 1709 ( trunc					PGNSP PGUID 12 f f f t f i 2 1700 "1700 23" 100 0 0 100  numeric_trunc - _null_ ));
+DATA(insert OID = 1709 ( trunc					PGNSP PGUID 12 f f t f i 2 1700 "1700 23"  numeric_trunc - _null_ ));
 DESCR("value truncated to 'scale'");
-DATA(insert OID = 1710 ( trunc					PGNSP PGUID 14 f f f t f i 1 1700 "1700" 100 0 0 100  "select trunc($1,0)" - _null_ ));
+DATA(insert OID = 1710 ( trunc					PGNSP PGUID 14 f f t f i 1 1700 "1700"  "select trunc($1,0)" - _null_ ));
 DESCR("value truncated to 'scale' of zero");
-DATA(insert OID = 1711 ( ceil					PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_ceil - _null_ ));
+DATA(insert OID = 1711 ( ceil					PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_ceil - _null_ ));
 DESCR("smallest integer >= value");
-DATA(insert OID = 1712 ( floor					PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_floor - _null_ ));
+DATA(insert OID = 1712 ( floor					PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_floor - _null_ ));
 DESCR("largest integer <= value");
-DATA(insert OID = 1718 ( numeric_eq				PGNSP PGUID 12 f f f t f i 2 16 "1700 1700" 100 0 0 100  numeric_eq - _null_ ));
+DATA(insert OID = 1718 ( numeric_eq				PGNSP PGUID 12 f f t f i 2 16 "1700 1700"  numeric_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1719 ( numeric_ne				PGNSP PGUID 12 f f f t f i 2 16 "1700 1700" 100 0 0 100  numeric_ne - _null_ ));
+DATA(insert OID = 1719 ( numeric_ne				PGNSP PGUID 12 f f t f i 2 16 "1700 1700"  numeric_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1720 ( numeric_gt				PGNSP PGUID 12 f f f t f i 2 16 "1700 1700" 100 0 0 100  numeric_gt - _null_ ));
+DATA(insert OID = 1720 ( numeric_gt				PGNSP PGUID 12 f f t f i 2 16 "1700 1700"  numeric_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1721 ( numeric_ge				PGNSP PGUID 12 f f f t f i 2 16 "1700 1700" 100 0 0 100  numeric_ge - _null_ ));
+DATA(insert OID = 1721 ( numeric_ge				PGNSP PGUID 12 f f t f i 2 16 "1700 1700"  numeric_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1722 ( numeric_lt				PGNSP PGUID 12 f f f t f i 2 16 "1700 1700" 100 0 0 100  numeric_lt - _null_ ));
+DATA(insert OID = 1722 ( numeric_lt				PGNSP PGUID 12 f f t f i 2 16 "1700 1700"  numeric_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1723 ( numeric_le				PGNSP PGUID 12 f f f t f i 2 16 "1700 1700" 100 0 0 100  numeric_le - _null_ ));
+DATA(insert OID = 1723 ( numeric_le				PGNSP PGUID 12 f f t f i 2 16 "1700 1700"  numeric_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1724 ( numeric_add			PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_add - _null_ ));
+DATA(insert OID = 1724 ( numeric_add			PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_add - _null_ ));
 DESCR("add");
-DATA(insert OID = 1725 ( numeric_sub			PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_sub - _null_ ));
+DATA(insert OID = 1725 ( numeric_sub			PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_sub - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1726 ( numeric_mul			PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_mul - _null_ ));
+DATA(insert OID = 1726 ( numeric_mul			PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_mul - _null_ ));
 DESCR("multiply");
-DATA(insert OID = 1727 ( numeric_div			PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_div - _null_ ));
+DATA(insert OID = 1727 ( numeric_div			PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_div - _null_ ));
 DESCR("divide");
-DATA(insert OID = 1728 ( mod					PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_mod - _null_ ));
+DATA(insert OID = 1728 ( mod					PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 1729 ( numeric_mod			PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_mod - _null_ ));
+DATA(insert OID = 1729 ( numeric_mod			PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_mod - _null_ ));
 DESCR("modulus");
-DATA(insert OID = 1730 ( sqrt					PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_sqrt - _null_ ));
+DATA(insert OID = 1730 ( sqrt					PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_sqrt - _null_ ));
 DESCR("square root");
-DATA(insert OID = 1731 ( numeric_sqrt			PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_sqrt - _null_ ));
+DATA(insert OID = 1731 ( numeric_sqrt			PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_sqrt - _null_ ));
 DESCR("square root");
-DATA(insert OID = 1732 ( exp					PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_exp - _null_ ));
+DATA(insert OID = 1732 ( exp					PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_exp - _null_ ));
 DESCR("e raised to the power of n");
-DATA(insert OID = 1733 ( numeric_exp			PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_exp - _null_ ));
+DATA(insert OID = 1733 ( numeric_exp			PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_exp - _null_ ));
 DESCR("e raised to the power of n");
-DATA(insert OID = 1734 ( ln						PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_ln - _null_ ));
+DATA(insert OID = 1734 ( ln						PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_ln - _null_ ));
 DESCR("natural logarithm of n");
-DATA(insert OID = 1735 ( numeric_ln				PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_ln - _null_ ));
+DATA(insert OID = 1735 ( numeric_ln				PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_ln - _null_ ));
 DESCR("natural logarithm of n");
-DATA(insert OID = 1736 ( log					PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_log - _null_ ));
+DATA(insert OID = 1736 ( log					PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_log - _null_ ));
 DESCR("logarithm base m of n");
-DATA(insert OID = 1737 ( numeric_log			PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_log - _null_ ));
+DATA(insert OID = 1737 ( numeric_log			PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_log - _null_ ));
 DESCR("logarithm base m of n");
-DATA(insert OID = 1738 ( pow					PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_power - _null_ ));
+DATA(insert OID = 1738 ( pow					PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_power - _null_ ));
 DESCR("m raised to the power of n");
-DATA(insert OID = 1739 ( numeric_power			PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_power - _null_ ));
+DATA(insert OID = 1739 ( numeric_power			PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_power - _null_ ));
 DESCR("m raised to the power of n");
-DATA(insert OID = 1740 ( numeric				PGNSP PGUID 12 f f t t f i 1 1700 "23" 100 0 0 100	int4_numeric - _null_ ));
+DATA(insert OID = 1740 ( numeric				PGNSP PGUID 12 f f t f i 1 1700 "23"	int4_numeric - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1741 ( log					PGNSP PGUID 14 f f f t f i 1 1700 "1700" 100 0 0 100  "select log(10, $1)" - _null_ ));
+DATA(insert OID = 1741 ( log					PGNSP PGUID 14 f f t f i 1 1700 "1700"  "select log(10, $1)" - _null_ ));
 DESCR("logarithm base 10 of n");
-DATA(insert OID = 1742 ( numeric				PGNSP PGUID 12 f f t t f i 1 1700 "700" 100 0 0 100  float4_numeric - _null_ ));
+DATA(insert OID = 1742 ( numeric				PGNSP PGUID 12 f f t f i 1 1700 "700"  float4_numeric - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1743 ( numeric				PGNSP PGUID 12 f f t t f i 1 1700 "701" 100 0 0 100  float8_numeric - _null_ ));
+DATA(insert OID = 1743 ( numeric				PGNSP PGUID 12 f f t f i 1 1700 "701"  float8_numeric - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1744 ( int4					PGNSP PGUID 12 f f f t f i 1 23 "1700" 100 0 0 100	numeric_int4 - _null_ ));
+DATA(insert OID = 1744 ( int4					PGNSP PGUID 12 f f t f i 1 23 "1700"	numeric_int4 - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1745 ( float4					PGNSP PGUID 12 f f f t f i 1 700 "1700" 100 0 0 100  numeric_float4 - _null_ ));
+DATA(insert OID = 1745 ( float4					PGNSP PGUID 12 f f t f i 1 700 "1700"  numeric_float4 - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1746 ( float8					PGNSP PGUID 12 f f f t f i 1 701 "1700" 100 0 0 100  numeric_float8 - _null_ ));
+DATA(insert OID = 1746 ( float8					PGNSP PGUID 12 f f t f i 1 701 "1700"  numeric_float8 - _null_ ));
 DESCR("(internal)");
 
-DATA(insert OID = 1747 ( time_pl_interval		PGNSP PGUID 12 f f f t f i 2 1083 "1083 1186" 100 0 0 100  time_pl_interval - _null_ ));
+DATA(insert OID = 1747 ( time_pl_interval		PGNSP PGUID 12 f f t f i 2 1083 "1083 1186"  time_pl_interval - _null_ ));
 DESCR("plus");
-DATA(insert OID = 1748 ( time_mi_interval		PGNSP PGUID 12 f f f t f i 2 1083 "1083 1186" 100 0 0 100  time_mi_interval - _null_ ));
+DATA(insert OID = 1748 ( time_mi_interval		PGNSP PGUID 12 f f t f i 2 1083 "1083 1186"  time_mi_interval - _null_ ));
 DESCR("minus");
-DATA(insert OID = 1749 ( timetz_pl_interval		PGNSP PGUID 12 f f f t f i 2 1266 "1266 1186" 100 0 0 100  timetz_pl_interval - _null_ ));
+DATA(insert OID = 1749 ( timetz_pl_interval		PGNSP PGUID 12 f f t f i 2 1266 "1266 1186"  timetz_pl_interval - _null_ ));
 DESCR("plus");
-DATA(insert OID = 1750 ( timetz_mi_interval		PGNSP PGUID 12 f f f t f i 2 1266 "1266 1186" 100 0 0 100  timetz_mi_interval - _null_ ));
+DATA(insert OID = 1750 ( timetz_mi_interval		PGNSP PGUID 12 f f t f i 2 1266 "1266 1186"  timetz_mi_interval - _null_ ));
 DESCR("minus");
 
-DATA(insert OID = 1764 ( numeric_inc			PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_inc - _null_ ));
+DATA(insert OID = 1764 ( numeric_inc			PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_inc - _null_ ));
 DESCR("increment by one");
-DATA(insert OID = 1766 ( numeric_smaller		PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_smaller - _null_ ));
+DATA(insert OID = 1766 ( numeric_smaller		PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_smaller - _null_ ));
 DESCR("smaller of two numbers");
-DATA(insert OID = 1767 ( numeric_larger			PGNSP PGUID 12 f f f t f i 2 1700 "1700 1700" 100 0 0 100  numeric_larger - _null_ ));
+DATA(insert OID = 1767 ( numeric_larger			PGNSP PGUID 12 f f t f i 2 1700 "1700 1700"  numeric_larger - _null_ ));
 DESCR("larger of two numbers");
-DATA(insert OID = 1769 ( numeric_cmp			PGNSP PGUID 12 f f f t f i 2 23 "1700 1700" 100 0 0 100  numeric_cmp - _null_ ));
+DATA(insert OID = 1769 ( numeric_cmp			PGNSP PGUID 12 f f t f i 2 23 "1700 1700"  numeric_cmp - _null_ ));
 DESCR("compare two numbers");
-DATA(insert OID = 1771 ( numeric_uminus			PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_uminus - _null_ ));
+DATA(insert OID = 1771 ( numeric_uminus			PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_uminus - _null_ ));
 DESCR("negate");
-DATA(insert OID = 1779 ( int8					PGNSP PGUID 12 f f f t f i 1 20 "1700" 100 0 0 100	numeric_int8 - _null_ ));
+DATA(insert OID = 1779 ( int8					PGNSP PGUID 12 f f t f i 1 20 "1700"	numeric_int8 - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1781 ( numeric				PGNSP PGUID 12 f f t t f i 1 1700 "20" 100 0 0 100	int8_numeric - _null_ ));
+DATA(insert OID = 1781 ( numeric				PGNSP PGUID 12 f f t f i 1 1700 "20"	int8_numeric - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1782 ( numeric				PGNSP PGUID 12 f f t t f i 1 1700 "21" 100 0 0 100	int2_numeric - _null_ ));
+DATA(insert OID = 1782 ( numeric				PGNSP PGUID 12 f f t f i 1 1700 "21"	int2_numeric - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1783 ( int2					PGNSP PGUID 12 f f f t f i 1 21 "1700" 100 0 0 100	numeric_int2 - _null_ ));
+DATA(insert OID = 1783 ( int2					PGNSP PGUID 12 f f t f i 1 21 "1700"	numeric_int2 - _null_ ));
 DESCR("(internal)");
 
 /* formatting */
-DATA(insert OID = 1770 ( to_char			PGNSP PGUID 12 f f f t f s 2	25 "1184 25" 100 0 0 100  timestamptz_to_char - _null_ ));
+DATA(insert OID = 1770 ( to_char			PGNSP PGUID 12 f f t f s 2	25 "1184 25"  timestamptz_to_char - _null_ ));
 DESCR("format timestamp with time zone to text");
-DATA(insert OID = 1772 ( to_char			PGNSP PGUID 12 f f f t f i 2	25 "1700 25" 100 0 0 100  numeric_to_char - _null_ ));
+DATA(insert OID = 1772 ( to_char			PGNSP PGUID 12 f f t f i 2	25 "1700 25"  numeric_to_char - _null_ ));
 DESCR("format numeric to text");
-DATA(insert OID = 1773 ( to_char			PGNSP PGUID 12 f f f t f i 2	25 "23 25" 100 0 0 100	int4_to_char - _null_ ));
+DATA(insert OID = 1773 ( to_char			PGNSP PGUID 12 f f t f i 2	25 "23 25"	int4_to_char - _null_ ));
 DESCR("format int4 to text");
-DATA(insert OID = 1774 ( to_char			PGNSP PGUID 12 f f f t f i 2	25 "20 25" 100 0 0 100	int8_to_char - _null_ ));
+DATA(insert OID = 1774 ( to_char			PGNSP PGUID 12 f f t f i 2	25 "20 25"	int8_to_char - _null_ ));
 DESCR("format int8 to text");
-DATA(insert OID = 1775 ( to_char			PGNSP PGUID 12 f f f t f i 2	25 "700 25" 100 0 0 100  float4_to_char - _null_ ));
+DATA(insert OID = 1775 ( to_char			PGNSP PGUID 12 f f t f i 2	25 "700 25"  float4_to_char - _null_ ));
 DESCR("format float4 to text");
-DATA(insert OID = 1776 ( to_char			PGNSP PGUID 12 f f f t f i 2	25 "701 25" 100 0 0 100  float8_to_char - _null_ ));
+DATA(insert OID = 1776 ( to_char			PGNSP PGUID 12 f f t f i 2	25 "701 25"  float8_to_char - _null_ ));
 DESCR("format float8 to text");
-DATA(insert OID = 1777 ( to_number			PGNSP PGUID 12 f f f t f i 2	1700 "25 25" 100 0 0 100  numeric_to_number - _null_ ));
+DATA(insert OID = 1777 ( to_number			PGNSP PGUID 12 f f t f i 2	1700 "25 25"  numeric_to_number - _null_ ));
 DESCR("convert text to numeric");
-DATA(insert OID = 1778 ( to_timestamp		PGNSP PGUID 12 f f f t f s 2	1184 "25 25" 100 0 0 100  to_timestamp - _null_ ));
+DATA(insert OID = 1778 ( to_timestamp		PGNSP PGUID 12 f f t f s 2	1184 "25 25"  to_timestamp - _null_ ));
 DESCR("convert text to timestamp");
-DATA(insert OID = 1780 ( to_date			PGNSP PGUID 12 f f f t f i 2	1082 "25 25" 100 0 0 100  to_date - _null_ ));
+DATA(insert OID = 1780 ( to_date			PGNSP PGUID 12 f f t f i 2	1082 "25 25"  to_date - _null_ ));
 DESCR("convert text to date");
-DATA(insert OID = 1768 ( to_char			PGNSP PGUID 12 f f f t f i 2	25 "1186 25" 100 0 0 100  interval_to_char - _null_ ));
+DATA(insert OID = 1768 ( to_char			PGNSP PGUID 12 f f t f i 2	25 "1186 25"  interval_to_char - _null_ ));
 DESCR("format interval to text");
 
-DATA(insert OID =  1282 ( quote_ident	   PGNSP PGUID 12 f f f t f i 1 25 "25" 100 0 0 100 quote_ident - _null_ ));
+DATA(insert OID =  1282 ( quote_ident	   PGNSP PGUID 12 f f t f i 1 25 "25" quote_ident - _null_ ));
 DESCR("quote an identifier for usage in a querystring");
-DATA(insert OID =  1283 ( quote_literal    PGNSP PGUID 12 f f f t f i 1 25 "25" 100 0 0 100 quote_literal - _null_ ));
+DATA(insert OID =  1283 ( quote_literal    PGNSP PGUID 12 f f t f i 1 25 "25" quote_literal - _null_ ));
 DESCR("quote a literal for usage in a querystring");
 
-DATA(insert OID = 1798 (  oidin			   PGNSP PGUID 12 f f f t f i 1 26 "0" 100 0 0 100	oidin - _null_ ));
+DATA(insert OID = 1798 (  oidin			   PGNSP PGUID 12 f f t f i 1 26 "0"	oidin - _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1799 (  oidout		   PGNSP PGUID 12 f f f t f i 1 23 "0" 100 0 0 100	oidout - _null_ ));
+DATA(insert OID = 1799 (  oidout		   PGNSP PGUID 12 f f t f i 1 23 "0"	oidout - _null_ ));
 DESCR("(internal)");
 
 
-DATA(insert OID = 1810 (  bit_length	   PGNSP PGUID 14 f f f t f i 1 23 "17" 100 0 0 100 "select octet_length($1) * 8" - _null_ ));
+DATA(insert OID = 1810 (  bit_length	   PGNSP PGUID 14 f f t f i 1 23 "17" "select octet_length($1) * 8" - _null_ ));
 DESCR("length in bits");
-DATA(insert OID = 1811 (  bit_length	   PGNSP PGUID 14 f f f t f i 1 23 "25" 100 0 0 100 "select octet_length($1) * 8" - _null_ ));
+DATA(insert OID = 1811 (  bit_length	   PGNSP PGUID 14 f f t f i 1 23 "25" "select octet_length($1) * 8" - _null_ ));
 DESCR("length in bits");
-DATA(insert OID = 1812 (  bit_length	   PGNSP PGUID 14 f f f t f i 1 23 "1560" 100 0 0 100 "select length($1)" - _null_ ));
+DATA(insert OID = 1812 (  bit_length	   PGNSP PGUID 14 f f t f i 1 23 "1560" "select length($1)" - _null_ ));
 DESCR("length in bits");
 
 /* Selectivity estimators for LIKE and related operators */
-DATA(insert OID = 1814 ( iclikesel			PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  iclikesel - _null_ ));
+DATA(insert OID = 1814 ( iclikesel			PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  iclikesel - _null_ ));
 DESCR("restriction selectivity of ILIKE");
-DATA(insert OID = 1815 ( icnlikesel			PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  icnlikesel - _null_ ));
+DATA(insert OID = 1815 ( icnlikesel			PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  icnlikesel - _null_ ));
 DESCR("restriction selectivity of NOT ILIKE");
-DATA(insert OID = 1816 ( iclikejoinsel		PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  iclikejoinsel - _null_ ));
+DATA(insert OID = 1816 ( iclikejoinsel		PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  iclikejoinsel - _null_ ));
 DESCR("join selectivity of ILIKE");
-DATA(insert OID = 1817 ( icnlikejoinsel		PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  icnlikejoinsel - _null_ ));
+DATA(insert OID = 1817 ( icnlikejoinsel		PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  icnlikejoinsel - _null_ ));
 DESCR("join selectivity of NOT ILIKE");
-DATA(insert OID = 1818 ( regexeqsel			PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  regexeqsel - _null_ ));
+DATA(insert OID = 1818 ( regexeqsel			PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  regexeqsel - _null_ ));
 DESCR("restriction selectivity of regex match");
-DATA(insert OID = 1819 ( likesel			PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  likesel - _null_ ));
+DATA(insert OID = 1819 ( likesel			PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  likesel - _null_ ));
 DESCR("restriction selectivity of LIKE");
-DATA(insert OID = 1820 ( icregexeqsel		PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  icregexeqsel - _null_ ));
+DATA(insert OID = 1820 ( icregexeqsel		PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  icregexeqsel - _null_ ));
 DESCR("restriction selectivity of case-insensitive regex match");
-DATA(insert OID = 1821 ( regexnesel			PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  regexnesel - _null_ ));
+DATA(insert OID = 1821 ( regexnesel			PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  regexnesel - _null_ ));
 DESCR("restriction selectivity of regex non-match");
-DATA(insert OID = 1822 ( nlikesel			PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  nlikesel - _null_ ));
+DATA(insert OID = 1822 ( nlikesel			PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  nlikesel - _null_ ));
 DESCR("restriction selectivity of NOT LIKE");
-DATA(insert OID = 1823 ( icregexnesel		PGNSP PGUID 12 f f f t f s 4 701 "0 26 0 23" 100 0 0 100  icregexnesel - _null_ ));
+DATA(insert OID = 1823 ( icregexnesel		PGNSP PGUID 12 f f t f s 4 701 "0 26 0 23"  icregexnesel - _null_ ));
 DESCR("restriction selectivity of case-insensitive regex non-match");
-DATA(insert OID = 1824 ( regexeqjoinsel		PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  regexeqjoinsel - _null_ ));
+DATA(insert OID = 1824 ( regexeqjoinsel		PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  regexeqjoinsel - _null_ ));
 DESCR("join selectivity of regex match");
-DATA(insert OID = 1825 ( likejoinsel		PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  likejoinsel - _null_ ));
+DATA(insert OID = 1825 ( likejoinsel		PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  likejoinsel - _null_ ));
 DESCR("join selectivity of LIKE");
-DATA(insert OID = 1826 ( icregexeqjoinsel	PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  icregexeqjoinsel - _null_ ));
+DATA(insert OID = 1826 ( icregexeqjoinsel	PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  icregexeqjoinsel - _null_ ));
 DESCR("join selectivity of case-insensitive regex match");
-DATA(insert OID = 1827 ( regexnejoinsel		PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  regexnejoinsel - _null_ ));
+DATA(insert OID = 1827 ( regexnejoinsel		PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  regexnejoinsel - _null_ ));
 DESCR("join selectivity of regex non-match");
-DATA(insert OID = 1828 ( nlikejoinsel		PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  nlikejoinsel - _null_ ));
+DATA(insert OID = 1828 ( nlikejoinsel		PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  nlikejoinsel - _null_ ));
 DESCR("join selectivity of NOT LIKE");
-DATA(insert OID = 1829 ( icregexnejoinsel	PGNSP PGUID 12 f f f t f s 3 701 "0 26 0" 100 0 0 100  icregexnejoinsel - _null_ ));
+DATA(insert OID = 1829 ( icregexnejoinsel	PGNSP PGUID 12 f f t f s 3 701 "0 26 0"  icregexnejoinsel - _null_ ));
 DESCR("join selectivity of case-insensitive regex non-match");
 
 /* Aggregate-related functions */
-DATA(insert OID = 1830 (  float8_avg	   PGNSP PGUID 12 f f f t f i 1 701 "1022" 100 0 0 100	float8_avg - _null_ ));
+DATA(insert OID = 1830 (  float8_avg	   PGNSP PGUID 12 f f t f i 1 701 "1022"	float8_avg - _null_ ));
 DESCR("AVG aggregate final function");
-DATA(insert OID = 1831 (  float8_variance  PGNSP PGUID 12 f f f t f i 1 701 "1022" 100 0 0 100	float8_variance - _null_ ));
+DATA(insert OID = 1831 (  float8_variance  PGNSP PGUID 12 f f t f i 1 701 "1022"	float8_variance - _null_ ));
 DESCR("VARIANCE aggregate final function");
-DATA(insert OID = 1832 (  float8_stddev    PGNSP PGUID 12 f f f t f i 1 701 "1022" 100 0 0 100	float8_stddev - _null_ ));
+DATA(insert OID = 1832 (  float8_stddev    PGNSP PGUID 12 f f t f i 1 701 "1022"	float8_stddev - _null_ ));
 DESCR("STDDEV aggregate final function");
-DATA(insert OID = 1833 (  numeric_accum    PGNSP PGUID 12 f f f t f i 2 1231 "1231 1700" 100 0 0 100  numeric_accum - _null_ ));
+DATA(insert OID = 1833 (  numeric_accum    PGNSP PGUID 12 f f t f i 2 1231 "1231 1700"  numeric_accum - _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1834 (  int2_accum	   PGNSP PGUID 12 f f f t f i 2 1231 "1231 21" 100 0 0 100	int2_accum - _null_ ));
+DATA(insert OID = 1834 (  int2_accum	   PGNSP PGUID 12 f f t f i 2 1231 "1231 21"	int2_accum - _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1835 (  int4_accum	   PGNSP PGUID 12 f f f t f i 2 1231 "1231 23" 100 0 0 100	int4_accum - _null_ ));
+DATA(insert OID = 1835 (  int4_accum	   PGNSP PGUID 12 f f t f i 2 1231 "1231 23"	int4_accum - _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1836 (  int8_accum	   PGNSP PGUID 12 f f f t f i 2 1231 "1231 20" 100 0 0 100	int8_accum - _null_ ));
+DATA(insert OID = 1836 (  int8_accum	   PGNSP PGUID 12 f f t f i 2 1231 "1231 20"	int8_accum - _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1837 (  numeric_avg	   PGNSP PGUID 12 f f f t f i 1 1700 "1231" 100 0 0 100  numeric_avg - _null_ ));
+DATA(insert OID = 1837 (  numeric_avg	   PGNSP PGUID 12 f f t f i 1 1700 "1231"  numeric_avg - _null_ ));
 DESCR("AVG aggregate final function");
-DATA(insert OID = 1838 (  numeric_variance PGNSP PGUID 12 f f f t f i 1 1700 "1231" 100 0 0 100  numeric_variance - _null_ ));
+DATA(insert OID = 1838 (  numeric_variance PGNSP PGUID 12 f f t f i 1 1700 "1231"  numeric_variance - _null_ ));
 DESCR("VARIANCE aggregate final function");
-DATA(insert OID = 1839 (  numeric_stddev   PGNSP PGUID 12 f f f t f i 1 1700 "1231" 100 0 0 100  numeric_stddev - _null_ ));
+DATA(insert OID = 1839 (  numeric_stddev   PGNSP PGUID 12 f f t f i 1 1700 "1231"  numeric_stddev - _null_ ));
 DESCR("STDDEV aggregate final function");
-DATA(insert OID = 1840 (  int2_sum		   PGNSP PGUID 12 f f f f f i 2 20 "20 21" 100 0 0 100	int2_sum - _null_ ));
+DATA(insert OID = 1840 (  int2_sum		   PGNSP PGUID 12 f f f f i 2 20 "20 21"	int2_sum - _null_ ));
 DESCR("SUM(int2) transition function");
-DATA(insert OID = 1841 (  int4_sum		   PGNSP PGUID 12 f f f f f i 2 20 "20 23" 100 0 0 100	int4_sum - _null_ ));
+DATA(insert OID = 1841 (  int4_sum		   PGNSP PGUID 12 f f f f i 2 20 "20 23"	int4_sum - _null_ ));
 DESCR("SUM(int4) transition function");
-DATA(insert OID = 1842 (  int8_sum		   PGNSP PGUID 12 f f f f f i 2 1700 "1700 20" 100 0 0 100	int8_sum - _null_ ));
+DATA(insert OID = 1842 (  int8_sum		   PGNSP PGUID 12 f f f f i 2 1700 "1700 20"	int8_sum - _null_ ));
 DESCR("SUM(int8) transition function");
-DATA(insert OID = 1843 (  interval_accum   PGNSP PGUID 12 f f f t f i 2 1187 "1187 1186" 100 0 0 100  interval_accum - _null_ ));
+DATA(insert OID = 1843 (  interval_accum   PGNSP PGUID 12 f f t f i 2 1187 "1187 1186"  interval_accum - _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1844 (  interval_avg	   PGNSP PGUID 12 f f f t f i 1 1186 "1187" 100 0 0 100  interval_avg - _null_ ));
+DATA(insert OID = 1844 (  interval_avg	   PGNSP PGUID 12 f f t f i 1 1186 "1187"  interval_avg - _null_ ));
 DESCR("AVG aggregate final function");
-DATA(insert OID = 1962 (  int2_avg_accum   PGNSP PGUID 12 f f f t f i 2 1016 "1016 21" 100 0 0 100	int2_avg_accum - _null_ ));
+DATA(insert OID = 1962 (  int2_avg_accum   PGNSP PGUID 12 f f t f i 2 1016 "1016 21"	int2_avg_accum - _null_ ));
 DESCR("AVG(int2) transition function");
-DATA(insert OID = 1963 (  int4_avg_accum   PGNSP PGUID 12 f f f t f i 2 1016 "1016 23" 100 0 0 100	int4_avg_accum - _null_ ));
+DATA(insert OID = 1963 (  int4_avg_accum   PGNSP PGUID 12 f f t f i 2 1016 "1016 23"	int4_avg_accum - _null_ ));
 DESCR("AVG(int4) transition function");
-DATA(insert OID = 1964 (  int8_avg		   PGNSP PGUID 12 f f f t f i 1 1700 "1016" 100 0 0 100  int8_avg - _null_ ));
+DATA(insert OID = 1964 (  int8_avg		   PGNSP PGUID 12 f f t f i 1 1700 "1016"  int8_avg - _null_ ));
 DESCR("AVG(int) aggregate final function");
 
 /* To ASCII conversion */
-DATA(insert OID = 1845 ( to_ascii	PGNSP PGUID 12 f f f t f i 1	25 "25" 100 0 0 100  to_ascii_default - _null_ ));
+DATA(insert OID = 1845 ( to_ascii	PGNSP PGUID 12 f f t f i 1	25 "25"  to_ascii_default - _null_ ));
 DESCR("encode text from DB encoding to ASCII text");
-DATA(insert OID = 1846 ( to_ascii	PGNSP PGUID 12 f f f t f i 2	25 "25 23" 100 0 0 100	to_ascii_enc - _null_ ));
+DATA(insert OID = 1846 ( to_ascii	PGNSP PGUID 12 f f t f i 2	25 "25 23"	to_ascii_enc - _null_ ));
 DESCR("encode text from encoding to ASCII text");
-DATA(insert OID = 1847 ( to_ascii	PGNSP PGUID 12 f f f t f i 2	25 "25 19" 100 0 0 100	to_ascii_encname - _null_ ));
+DATA(insert OID = 1847 ( to_ascii	PGNSP PGUID 12 f f t f i 2	25 "25 19"	to_ascii_encname - _null_ ));
 DESCR("encode text from encoding to ASCII text");
 
-DATA(insert OID = 1848 ( interval_pl_time		PGNSP PGUID 12 f f f t f i 2 1083 "1186 1083" 100 0 0 100  interval_pl_time - _null_ ));
+DATA(insert OID = 1848 ( interval_pl_time		PGNSP PGUID 12 f f t f i 2 1083 "1186 1083"  interval_pl_time - _null_ ));
 DESCR("plus");
 
-DATA(insert OID = 1850 (  int28eq		   PGNSP PGUID 12 f f f t f i 2 16 "21 20" 100 0 0 100	int28eq - _null_ ));
+DATA(insert OID = 1850 (  int28eq		   PGNSP PGUID 12 f f t f i 2 16 "21 20"	int28eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1851 (  int28ne		   PGNSP PGUID 12 f f f t f i 2 16 "21 20" 100 0 0 100	int28ne - _null_ ));
+DATA(insert OID = 1851 (  int28ne		   PGNSP PGUID 12 f f t f i 2 16 "21 20"	int28ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1852 (  int28lt		   PGNSP PGUID 12 f f f t f i 2 16 "21 20" 100 0 0 100	int28lt - _null_ ));
+DATA(insert OID = 1852 (  int28lt		   PGNSP PGUID 12 f f t f i 2 16 "21 20"	int28lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1853 (  int28gt		   PGNSP PGUID 12 f f f t f i 2 16 "21 20" 100 0 0 100	int28gt - _null_ ));
+DATA(insert OID = 1853 (  int28gt		   PGNSP PGUID 12 f f t f i 2 16 "21 20"	int28gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1854 (  int28le		   PGNSP PGUID 12 f f f t f i 2 16 "21 20" 100 0 0 100	int28le - _null_ ));
+DATA(insert OID = 1854 (  int28le		   PGNSP PGUID 12 f f t f i 2 16 "21 20"	int28le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1855 (  int28ge		   PGNSP PGUID 12 f f f t f i 2 16 "21 20" 100 0 0 100	int28ge - _null_ ));
+DATA(insert OID = 1855 (  int28ge		   PGNSP PGUID 12 f f t f i 2 16 "21 20"	int28ge - _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 1856 (  int82eq		   PGNSP PGUID 12 f f f t f i 2 16 "20 21" 100 0 0 100	int82eq - _null_ ));
+DATA(insert OID = 1856 (  int82eq		   PGNSP PGUID 12 f f t f i 2 16 "20 21"	int82eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1857 (  int82ne		   PGNSP PGUID 12 f f f t f i 2 16 "20 21" 100 0 0 100	int82ne - _null_ ));
+DATA(insert OID = 1857 (  int82ne		   PGNSP PGUID 12 f f t f i 2 16 "20 21"	int82ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1858 (  int82lt		   PGNSP PGUID 12 f f f t f i 2 16 "20 21" 100 0 0 100	int82lt - _null_ ));
+DATA(insert OID = 1858 (  int82lt		   PGNSP PGUID 12 f f t f i 2 16 "20 21"	int82lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1859 (  int82gt		   PGNSP PGUID 12 f f f t f i 2 16 "20 21" 100 0 0 100	int82gt - _null_ ));
+DATA(insert OID = 1859 (  int82gt		   PGNSP PGUID 12 f f t f i 2 16 "20 21"	int82gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1860 (  int82le		   PGNSP PGUID 12 f f f t f i 2 16 "20 21" 100 0 0 100	int82le - _null_ ));
+DATA(insert OID = 1860 (  int82le		   PGNSP PGUID 12 f f t f i 2 16 "20 21"	int82le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1861 (  int82ge		   PGNSP PGUID 12 f f f t f i 2 16 "20 21" 100 0 0 100	int82ge - _null_ ));
+DATA(insert OID = 1861 (  int82ge		   PGNSP PGUID 12 f f t f i 2 16 "20 21"	int82ge - _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 1892 (  int2and		   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2and - _null_ ));
+DATA(insert OID = 1892 (  int2and		   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2and - _null_ ));
 DESCR("binary and");
-DATA(insert OID = 1893 (  int2or		   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2or - _null_ ));
+DATA(insert OID = 1893 (  int2or		   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2or - _null_ ));
 DESCR("binary or");
-DATA(insert OID = 1894 (  int2xor		   PGNSP PGUID 12 f f f t f i 2 21 "21 21" 100 0 0 100	int2xor - _null_ ));
+DATA(insert OID = 1894 (  int2xor		   PGNSP PGUID 12 f f t f i 2 21 "21 21"	int2xor - _null_ ));
 DESCR("binary xor");
-DATA(insert OID = 1895 (  int2not		   PGNSP PGUID 12 f f f t f i 1 21 "21" 100 0 0 100  int2not - _null_ ));
+DATA(insert OID = 1895 (  int2not		   PGNSP PGUID 12 f f t f i 1 21 "21"  int2not - _null_ ));
 DESCR("binary not");
-DATA(insert OID = 1896 (  int2shl		   PGNSP PGUID 12 f f f t f i 2 21 "21 23" 100 0 0 100	int2shl - _null_ ));
+DATA(insert OID = 1896 (  int2shl		   PGNSP PGUID 12 f f t f i 2 21 "21 23"	int2shl - _null_ ));
 DESCR("binary shift left");
-DATA(insert OID = 1897 (  int2shr		   PGNSP PGUID 12 f f f t f i 2 21 "21 23" 100 0 0 100	int2shr - _null_ ));
+DATA(insert OID = 1897 (  int2shr		   PGNSP PGUID 12 f f t f i 2 21 "21 23"	int2shr - _null_ ));
 DESCR("binary shift right");
 
-DATA(insert OID = 1898 (  int4and		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4and - _null_ ));
+DATA(insert OID = 1898 (  int4and		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4and - _null_ ));
 DESCR("binary and");
-DATA(insert OID = 1899 (  int4or		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4or - _null_ ));
+DATA(insert OID = 1899 (  int4or		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4or - _null_ ));
 DESCR("binary or");
-DATA(insert OID = 1900 (  int4xor		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4xor - _null_ ));
+DATA(insert OID = 1900 (  int4xor		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4xor - _null_ ));
 DESCR("binary xor");
-DATA(insert OID = 1901 (  int4not		   PGNSP PGUID 12 f f f t f i 1 23 "23" 100 0 0 100  int4not - _null_ ));
+DATA(insert OID = 1901 (  int4not		   PGNSP PGUID 12 f f t f i 1 23 "23"  int4not - _null_ ));
 DESCR("binary not");
-DATA(insert OID = 1902 (  int4shl		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4shl - _null_ ));
+DATA(insert OID = 1902 (  int4shl		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4shl - _null_ ));
 DESCR("binary shift left");
-DATA(insert OID = 1903 (  int4shr		   PGNSP PGUID 12 f f f t f i 2 23 "23 23" 100 0 0 100	int4shr - _null_ ));
+DATA(insert OID = 1903 (  int4shr		   PGNSP PGUID 12 f f t f i 2 23 "23 23"	int4shr - _null_ ));
 DESCR("binary shift right");
 
-DATA(insert OID = 1904 (  int8and		   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8and - _null_ ));
+DATA(insert OID = 1904 (  int8and		   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8and - _null_ ));
 DESCR("binary and");
-DATA(insert OID = 1905 (  int8or		   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8or - _null_ ));
+DATA(insert OID = 1905 (  int8or		   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8or - _null_ ));
 DESCR("binary or");
-DATA(insert OID = 1906 (  int8xor		   PGNSP PGUID 12 f f f t f i 2 20 "20 20" 100 0 0 100	int8xor - _null_ ));
+DATA(insert OID = 1906 (  int8xor		   PGNSP PGUID 12 f f t f i 2 20 "20 20"	int8xor - _null_ ));
 DESCR("binary xor");
-DATA(insert OID = 1907 (  int8not		   PGNSP PGUID 12 f f f t f i 1 20 "20" 100 0 0 100  int8not - _null_ ));
+DATA(insert OID = 1907 (  int8not		   PGNSP PGUID 12 f f t f i 1 20 "20"  int8not - _null_ ));
 DESCR("binary not");
-DATA(insert OID = 1908 (  int8shl		   PGNSP PGUID 12 f f f t f i 2 20 "20 23" 100 0 0 100	int8shl - _null_ ));
+DATA(insert OID = 1908 (  int8shl		   PGNSP PGUID 12 f f t f i 2 20 "20 23"	int8shl - _null_ ));
 DESCR("binary shift left");
-DATA(insert OID = 1909 (  int8shr		   PGNSP PGUID 12 f f f t f i 2 20 "20 23" 100 0 0 100	int8shr - _null_ ));
+DATA(insert OID = 1909 (  int8shr		   PGNSP PGUID 12 f f t f i 2 20 "20 23"	int8shr - _null_ ));
 DESCR("binary shift right");
 
-DATA(insert OID = 1910 (  int8up		   PGNSP PGUID 12 f f f t f i 1 20	"20"   100 0 0 100	int8up - _null_ ));
+DATA(insert OID = 1910 (  int8up		   PGNSP PGUID 12 f f t f i 1 20	"20"  	int8up - _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1911 (  int2up		   PGNSP PGUID 12 f f f t f i 1 21	"21"   100 0 0 100	int2up - _null_ ));
+DATA(insert OID = 1911 (  int2up		   PGNSP PGUID 12 f f t f i 1 21	"21"  	int2up - _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1912 (  int4up		   PGNSP PGUID 12 f f f t f i 1 23	"23"   100 0 0 100	int4up - _null_ ));
+DATA(insert OID = 1912 (  int4up		   PGNSP PGUID 12 f f t f i 1 23	"23"  	int4up - _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1913 (  float4up		   PGNSP PGUID 12 f f f t f i 1 700 "700"  100 0 0 100	float4up - _null_ ));
+DATA(insert OID = 1913 (  float4up		   PGNSP PGUID 12 f f t f i 1 700 "700" 	float4up - _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1914 (  float8up		   PGNSP PGUID 12 f f f t f i 1 701 "701"  100 0 0 100	float8up - _null_ ));
+DATA(insert OID = 1914 (  float8up		   PGNSP PGUID 12 f f t f i 1 701 "701" 	float8up - _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1915 (  numeric_uplus    PGNSP PGUID 12 f f f t f i 1 1700 "1700" 100 0 0 100  numeric_uplus - _null_ ));
+DATA(insert OID = 1915 (  numeric_uplus    PGNSP PGUID 12 f f t f i 1 1700 "1700"  numeric_uplus - _null_ ));
 DESCR("unary plus");
 
-DATA(insert OID = 1922 (  has_table_privilege		   PGNSP PGUID 12 f f f t f s 3 16 "19 25 25" 100 0 0 100  has_table_privilege_name_name - _null_ ));
+DATA(insert OID = 1922 (  has_table_privilege		   PGNSP PGUID 12 f f t f s 3 16 "19 25 25"  has_table_privilege_name_name - _null_ ));
 DESCR("user privilege on relation by username, relname");
-DATA(insert OID = 1923 (  has_table_privilege		   PGNSP PGUID 12 f f f t f s 3 16 "19 26 25" 100 0 0 100  has_table_privilege_name_id - _null_ ));
+DATA(insert OID = 1923 (  has_table_privilege		   PGNSP PGUID 12 f f t f s 3 16 "19 26 25"  has_table_privilege_name_id - _null_ ));
 DESCR("user privilege on relation by username, rel oid");
-DATA(insert OID = 1924 (  has_table_privilege		   PGNSP PGUID 12 f f f t f s 3 16 "23 25 25" 100 0 0 100  has_table_privilege_id_name - _null_ ));
+DATA(insert OID = 1924 (  has_table_privilege		   PGNSP PGUID 12 f f t f s 3 16 "23 25 25"  has_table_privilege_id_name - _null_ ));
 DESCR("user privilege on relation by usesysid, relname");
-DATA(insert OID = 1925 (  has_table_privilege		   PGNSP PGUID 12 f f f t f s 3 16 "23 26 25" 100 0 0 100  has_table_privilege_id_id - _null_ ));
+DATA(insert OID = 1925 (  has_table_privilege		   PGNSP PGUID 12 f f t f s 3 16 "23 26 25"  has_table_privilege_id_id - _null_ ));
 DESCR("user privilege on relation by usesysid, rel oid");
-DATA(insert OID = 1926 (  has_table_privilege		   PGNSP PGUID 12 f f f t f s 2 16 "25 25" 100 0 0 100	has_table_privilege_name - _null_ ));
+DATA(insert OID = 1926 (  has_table_privilege		   PGNSP PGUID 12 f f t f s 2 16 "25 25"	has_table_privilege_name - _null_ ));
 DESCR("current user privilege on relation by relname");
-DATA(insert OID = 1927 (  has_table_privilege		   PGNSP PGUID 12 f f f t f s 2 16 "26 25" 100 0 0 100	has_table_privilege_id - _null_ ));
+DATA(insert OID = 1927 (  has_table_privilege		   PGNSP PGUID 12 f f t f s 2 16 "26 25"	has_table_privilege_id - _null_ ));
 DESCR("current user privilege on relation by rel oid");
 
 
-DATA(insert OID = 1928 (  pg_stat_get_numscans			PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_numscans - _null_ ));
+DATA(insert OID = 1928 (  pg_stat_get_numscans			PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_numscans - _null_ ));
 DESCR("Statistics: Number of scans done for table/index");
-DATA(insert OID = 1929 (  pg_stat_get_tuples_returned	PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_tuples_returned - _null_ ));
+DATA(insert OID = 1929 (  pg_stat_get_tuples_returned	PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_tuples_returned - _null_ ));
 DESCR("Statistics: Number of tuples read by seqscan");
-DATA(insert OID = 1930 (  pg_stat_get_tuples_fetched	PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_tuples_fetched - _null_ ));
+DATA(insert OID = 1930 (  pg_stat_get_tuples_fetched	PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_tuples_fetched - _null_ ));
 DESCR("Statistics: Number of tuples fetched by idxscan");
-DATA(insert OID = 1931 (  pg_stat_get_tuples_inserted	PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_tuples_inserted - _null_ ));
+DATA(insert OID = 1931 (  pg_stat_get_tuples_inserted	PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_tuples_inserted - _null_ ));
 DESCR("Statistics: Number of tuples inserted");
-DATA(insert OID = 1932 (  pg_stat_get_tuples_updated	PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_tuples_updated - _null_ ));
+DATA(insert OID = 1932 (  pg_stat_get_tuples_updated	PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_tuples_updated - _null_ ));
 DESCR("Statistics: Number of tuples updated");
-DATA(insert OID = 1933 (  pg_stat_get_tuples_deleted	PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_tuples_deleted - _null_ ));
+DATA(insert OID = 1933 (  pg_stat_get_tuples_deleted	PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_tuples_deleted - _null_ ));
 DESCR("Statistics: Number of tuples deleted");
-DATA(insert OID = 1934 (  pg_stat_get_blocks_fetched	PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_blocks_fetched - _null_ ));
+DATA(insert OID = 1934 (  pg_stat_get_blocks_fetched	PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_blocks_fetched - _null_ ));
 DESCR("Statistics: Number of blocks fetched");
-DATA(insert OID = 1935 (  pg_stat_get_blocks_hit		PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_blocks_hit - _null_ ));
+DATA(insert OID = 1935 (  pg_stat_get_blocks_hit		PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_blocks_hit - _null_ ));
 DESCR("Statistics: Number of blocks found in cache");
-DATA(insert OID = 1936 (  pg_stat_get_backend_idset		PGNSP PGUID 12 f f f t t s 0 23 "" 100 0 0 100	pg_stat_get_backend_idset - _null_ ));
+DATA(insert OID = 1936 (  pg_stat_get_backend_idset		PGNSP PGUID 12 f f t t s 0 23 ""	pg_stat_get_backend_idset - _null_ ));
 DESCR("Statistics: Currently active backend IDs");
-DATA(insert OID = 1937 (  pg_stat_get_backend_pid		PGNSP PGUID 12 f f f t f s 1 23 "23" 100 0 0 100  pg_stat_get_backend_pid - _null_ ));
+DATA(insert OID = 1937 (  pg_stat_get_backend_pid		PGNSP PGUID 12 f f t f s 1 23 "23"  pg_stat_get_backend_pid - _null_ ));
 DESCR("Statistics: PID of backend");
-DATA(insert OID = 1938 (  pg_stat_get_backend_dbid		PGNSP PGUID 12 f f f t f s 1 26 "23" 100 0 0 100  pg_stat_get_backend_dbid - _null_ ));
+DATA(insert OID = 1938 (  pg_stat_get_backend_dbid		PGNSP PGUID 12 f f t f s 1 26 "23"  pg_stat_get_backend_dbid - _null_ ));
 DESCR("Statistics: Database ID of backend");
-DATA(insert OID = 1939 (  pg_stat_get_backend_userid	PGNSP PGUID 12 f f f t f s 1 26 "23" 100 0 0 100  pg_stat_get_backend_userid - _null_ ));
+DATA(insert OID = 1939 (  pg_stat_get_backend_userid	PGNSP PGUID 12 f f t f s 1 26 "23"  pg_stat_get_backend_userid - _null_ ));
 DESCR("Statistics: User ID of backend");
-DATA(insert OID = 1940 (  pg_stat_get_backend_activity	PGNSP PGUID 12 f f f t f s 1 25 "23" 100 0 0 100  pg_stat_get_backend_activity - _null_ ));
+DATA(insert OID = 1940 (  pg_stat_get_backend_activity	PGNSP PGUID 12 f f t f s 1 25 "23"  pg_stat_get_backend_activity - _null_ ));
 DESCR("Statistics: Current query of backend");
-DATA(insert OID = 1941 (  pg_stat_get_db_numbackends	PGNSP PGUID 12 f f f t f s 1 23 "26" 100 0 0 100  pg_stat_get_db_numbackends - _null_ ));
+DATA(insert OID = 1941 (  pg_stat_get_db_numbackends	PGNSP PGUID 12 f f t f s 1 23 "26"  pg_stat_get_db_numbackends - _null_ ));
 DESCR("Statistics: Number of backends in database");
-DATA(insert OID = 1942 (  pg_stat_get_db_xact_commit	PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_db_xact_commit - _null_ ));
+DATA(insert OID = 1942 (  pg_stat_get_db_xact_commit	PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_db_xact_commit - _null_ ));
 DESCR("Statistics: Transactions committed");
-DATA(insert OID = 1943 (  pg_stat_get_db_xact_rollback	PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_db_xact_rollback - _null_ ));
+DATA(insert OID = 1943 (  pg_stat_get_db_xact_rollback	PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_db_xact_rollback - _null_ ));
 DESCR("Statistics: Transactions rolled back");
-DATA(insert OID = 1944 (  pg_stat_get_db_blocks_fetched PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_db_blocks_fetched - _null_ ));
+DATA(insert OID = 1944 (  pg_stat_get_db_blocks_fetched PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_db_blocks_fetched - _null_ ));
 DESCR("Statistics: Blocks fetched for database");
-DATA(insert OID = 1945 (  pg_stat_get_db_blocks_hit		PGNSP PGUID 12 f f f t f s 1 20 "26" 100 0 0 100  pg_stat_get_db_blocks_hit - _null_ ));
+DATA(insert OID = 1945 (  pg_stat_get_db_blocks_hit		PGNSP PGUID 12 f f t f s 1 20 "26"  pg_stat_get_db_blocks_hit - _null_ ));
 DESCR("Statistics: Block found in cache for database");
 
-DATA(insert OID = 1946 (  encode						PGNSP PGUID 12 f f f t f i 2 25 "17 25" 100 0 0 100  binary_encode - _null_ ));
+DATA(insert OID = 1946 (  encode						PGNSP PGUID 12 f f t f i 2 25 "17 25"  binary_encode - _null_ ));
 DESCR("Convert bytea value into some ascii-only text string");
-DATA(insert OID = 1947 (  decode						PGNSP PGUID 12 f f f t f i 2 17 "25 25" 100 0 0 100  binary_decode - _null_ ));
+DATA(insert OID = 1947 (  decode						PGNSP PGUID 12 f f t f i 2 17 "25 25"  binary_decode - _null_ ));
 DESCR("Convert ascii-encoded text string into bytea value");
 
-DATA(insert OID = 1948 (  byteaeq		   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100	byteaeq - _null_ ));
+DATA(insert OID = 1948 (  byteaeq		   PGNSP PGUID 12 f f t f i 2 16 "17 17"	byteaeq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 1949 (  bytealt		   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100	bytealt - _null_ ));
+DATA(insert OID = 1949 (  bytealt		   PGNSP PGUID 12 f f t f i 2 16 "17 17"	bytealt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1950 (  byteale		   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100	byteale - _null_ ));
+DATA(insert OID = 1950 (  byteale		   PGNSP PGUID 12 f f t f i 2 16 "17 17"	byteale - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1951 (  byteagt		   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100	byteagt - _null_ ));
+DATA(insert OID = 1951 (  byteagt		   PGNSP PGUID 12 f f t f i 2 16 "17 17"	byteagt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1952 (  byteage		   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100	byteage - _null_ ));
+DATA(insert OID = 1952 (  byteage		   PGNSP PGUID 12 f f t f i 2 16 "17 17"	byteage - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1953 (  byteane		   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100	byteane - _null_ ));
+DATA(insert OID = 1953 (  byteane		   PGNSP PGUID 12 f f t f i 2 16 "17 17"	byteane - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1954 (  byteacmp		   PGNSP PGUID 12 f f f t f i 2 23 "17 17" 100 0 0 100	byteacmp - _null_ ));
+DATA(insert OID = 1954 (  byteacmp		   PGNSP PGUID 12 f f t f i 2 23 "17 17"	byteacmp - _null_ ));
 DESCR("less-equal-greater");
 
-DATA(insert OID = 1961 (  timestamp		   PGNSP PGUID 12 f f t t f i 2 1114 "1114 23" 100 0 0 100	timestamp_scale - _null_ ));
+DATA(insert OID = 1961 (  timestamp		   PGNSP PGUID 12 f f t f i 2 1114 "1114 23"	timestamp_scale - _null_ ));
 DESCR("adjust time precision");
 
-DATA(insert OID = 1965 (  oidlarger		   PGNSP PGUID 12 f f f t f i 2 26 "26 26" 100 0 0 100	oidlarger - _null_ ));
+DATA(insert OID = 1965 (  oidlarger		   PGNSP PGUID 12 f f t f i 2 26 "26 26"	oidlarger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1966 (  oidsmaller	   PGNSP PGUID 12 f f f t f i 2 26 "26 26" 100 0 0 100	oidsmaller - _null_ ));
+DATA(insert OID = 1966 (  oidsmaller	   PGNSP PGUID 12 f f t f i 2 26 "26 26"	oidsmaller - _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 1967 (  timestamptz	   PGNSP PGUID 12 f f t t f i 2 1184 "1184 23" 100 0 0 100	timestamptz_scale - _null_ ));
+DATA(insert OID = 1967 (  timestamptz	   PGNSP PGUID 12 f f t f i 2 1184 "1184 23"	timestamptz_scale - _null_ ));
 DESCR("adjust time precision");
-DATA(insert OID = 1968 (  time			   PGNSP PGUID 12 f f t t f i 2 1083 "1083 23" 100 0 0 100	time_scale - _null_ ));
+DATA(insert OID = 1968 (  time			   PGNSP PGUID 12 f f t f i 2 1083 "1083 23"	time_scale - _null_ ));
 DESCR("adjust time precision");
-DATA(insert OID = 1969 (  timetz		   PGNSP PGUID 12 f f t t f i 2 1266 "1266 23" 100 0 0 100	timetz_scale - _null_ ));
+DATA(insert OID = 1969 (  timetz		   PGNSP PGUID 12 f f t f i 2 1266 "1266 23"	timetz_scale - _null_ ));
 DESCR("adjust time with time zone precision");
 
-DATA(insert OID = 2005 (  bytealike		   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100 bytealike - _null_ ));
+DATA(insert OID = 2005 (  bytealike		   PGNSP PGUID 12 f f t f i 2 16 "17 17" bytealike - _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID = 2006 (  byteanlike	   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100 byteanlike - _null_ ));
+DATA(insert OID = 2006 (  byteanlike	   PGNSP PGUID 12 f f t f i 2 16 "17 17" byteanlike - _null_ ));
 DESCR("does not match LIKE expression");
-DATA(insert OID = 2007 (  like			   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100	bytealike - _null_ ));
+DATA(insert OID = 2007 (  like			   PGNSP PGUID 12 f f t f i 2 16 "17 17"	bytealike - _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID = 2008 (  notlike		   PGNSP PGUID 12 f f f t f i 2 16 "17 17" 100 0 0 100	byteanlike - _null_ ));
+DATA(insert OID = 2008 (  notlike		   PGNSP PGUID 12 f f t f i 2 16 "17 17"	byteanlike - _null_ ));
 DESCR("does not match LIKE expression");
-DATA(insert OID = 2009 (  like_escape	   PGNSP PGUID 12 f f f t f i 2 17 "17 17" 100 0 0 100 like_escape_bytea - _null_ ));
+DATA(insert OID = 2009 (  like_escape	   PGNSP PGUID 12 f f t f i 2 17 "17 17" like_escape_bytea - _null_ ));
 DESCR("convert match pattern to use backslash escapes");
-DATA(insert OID = 2010 (  length		   PGNSP PGUID 12 f f f t f i 1 23 "17" 100 0 0 100  byteaoctetlen - _null_ ));
+DATA(insert OID = 2010 (  length		   PGNSP PGUID 12 f f t f i 1 23 "17"  byteaoctetlen - _null_ ));
 DESCR("octet length");
-DATA(insert OID = 2011 (  byteacat		   PGNSP PGUID 12 f f f t f i 2 17 "17 17" 100 0 0 100	byteacat - _null_ ));
+DATA(insert OID = 2011 (  byteacat		   PGNSP PGUID 12 f f t f i 2 17 "17 17"	byteacat - _null_ ));
 DESCR("concatenate");
-DATA(insert OID = 2012 (  substring		   PGNSP PGUID 12 f f f t f i 3 17 "17 23 23" 100 0 0 100  bytea_substr - _null_ ));
+DATA(insert OID = 2012 (  substring		   PGNSP PGUID 12 f f t f i 3 17 "17 23 23"  bytea_substr - _null_ ));
 DESCR("return portion of string");
-DATA(insert OID = 2013 (  substring		   PGNSP PGUID 14 f f f t f i 2 17 "17 23" 100 0 0 100	"select substring($1, $2, -1)" - _null_ ));
+DATA(insert OID = 2013 (  substring		   PGNSP PGUID 14 f f t f i 2 17 "17 23"	"select substring($1, $2, -1)" - _null_ ));
 DESCR("return portion of string");
-DATA(insert OID = 2014 (  position		   PGNSP PGUID 12 f f f t f i 2 23 "17 17" 100 0 0 100	byteapos - _null_ ));
+DATA(insert OID = 2014 (  position		   PGNSP PGUID 12 f f t f i 2 23 "17 17"	byteapos - _null_ ));
 DESCR("return position of substring");
-DATA(insert OID = 2015 (  btrim			   PGNSP PGUID 12 f f f t f i 2 17 "17 17" 100 0 0 100	byteatrim - _null_ ));
+DATA(insert OID = 2015 (  btrim			   PGNSP PGUID 12 f f t f i 2 17 "17 17"	byteatrim - _null_ ));
 DESCR("trim both ends of string");
 
-DATA(insert OID = 2019 (  time				PGNSP PGUID 12 f f f t f s 1 1083 "1184" 100 0 0 100  timestamptz_time - _null_ ));
+DATA(insert OID = 2019 (  time				PGNSP PGUID 12 f f t f s 1 1083 "1184"  timestamptz_time - _null_ ));
 DESCR("convert timestamptz to time");
-DATA(insert OID = 2020 (  date_trunc		PGNSP PGUID 12 f f f t f i 2 1114 "25 1114" 100 0 0 100  timestamp_trunc - _null_ ));
+DATA(insert OID = 2020 (  date_trunc		PGNSP PGUID 12 f f t f i 2 1114 "25 1114"  timestamp_trunc - _null_ ));
 DESCR("truncate timestamp to specified units");
-DATA(insert OID = 2021 (  date_part			PGNSP PGUID 12 f f f t f i 2  701 "25 1114" 100 0 0 100  timestamp_part - _null_ ));
+DATA(insert OID = 2021 (  date_part			PGNSP PGUID 12 f f t f i 2  701 "25 1114"  timestamp_part - _null_ ));
 DESCR("extract field from timestamp");
-DATA(insert OID = 2022 (  timestamp			PGNSP PGUID 12 f f f t f s 1 1114 "25" 100 0 0 100	text_timestamp - _null_ ));
+DATA(insert OID = 2022 (  timestamp			PGNSP PGUID 12 f f t f s 1 1114 "25"	text_timestamp - _null_ ));
 DESCR("convert text to timestamp");
-DATA(insert OID = 2023 (  timestamp			PGNSP PGUID 12 f f t t f s 1 1114 "702" 100 0 0 100  abstime_timestamp - _null_ ));
+DATA(insert OID = 2023 (  timestamp			PGNSP PGUID 12 f f t f s 1 1114 "702"  abstime_timestamp - _null_ ));
 DESCR("convert abstime to timestamp");
-DATA(insert OID = 2024 (  timestamp			PGNSP PGUID 12 f f t t f i 1 1114 "1082" 100 0 0 100  date_timestamp - _null_ ));
+DATA(insert OID = 2024 (  timestamp			PGNSP PGUID 12 f f t f i 1 1114 "1082"  date_timestamp - _null_ ));
 DESCR("convert date to timestamp");
-DATA(insert OID = 2025 (  timestamp			PGNSP PGUID 12 f f f t f i 2 1114 "1082 1083" 100 0 0 100  datetime_timestamp - _null_ ));
+DATA(insert OID = 2025 (  timestamp			PGNSP PGUID 12 f f t f i 2 1114 "1082 1083"  datetime_timestamp - _null_ ));
 DESCR("convert date and time to timestamp");
-DATA(insert OID = 2027 (  timestamp			PGNSP PGUID 12 f f t t f s 1 1114 "1184" 100 0 0 100  timestamptz_timestamp - _null_ ));
+DATA(insert OID = 2027 (  timestamp			PGNSP PGUID 12 f f t f s 1 1114 "1184"  timestamptz_timestamp - _null_ ));
 DESCR("convert date and time with time zone to timestamp");
-DATA(insert OID = 2028 (  timestamptz		PGNSP PGUID 12 f f t t f s 1 1184 "1114" 100 0 0 100  timestamp_timestamptz - _null_ ));
+DATA(insert OID = 2028 (  timestamptz		PGNSP PGUID 12 f f t f s 1 1184 "1114"  timestamp_timestamptz - _null_ ));
 DESCR("convert date and time with time zone to timestamp");
-DATA(insert OID = 2029 (  date				PGNSP PGUID 12 f f f t f i 1 1082 "1114" 100 0 0 100  timestamp_date - _null_ ));
+DATA(insert OID = 2029 (  date				PGNSP PGUID 12 f f t f i 1 1082 "1114"  timestamp_date - _null_ ));
 DESCR("convert timestamp to date");
-DATA(insert OID = 2030 (  abstime			PGNSP PGUID 12 f f f t f s 1  702 "1114" 100 0 0 100  timestamp_abstime - _null_ ));
+DATA(insert OID = 2030 (  abstime			PGNSP PGUID 12 f f t f s 1  702 "1114"  timestamp_abstime - _null_ ));
 DESCR("convert timestamp to abstime");
-DATA(insert OID = 2031 (  timestamp_mi		PGNSP PGUID 12 f f f t f i 2 1186 "1114 1114" 100 0 0 100  timestamp_mi - _null_ ));
+DATA(insert OID = 2031 (  timestamp_mi		PGNSP PGUID 12 f f t f i 2 1186 "1114 1114"  timestamp_mi - _null_ ));
 DESCR("subtract");
-DATA(insert OID = 2032 (  timestamp_pl_span PGNSP PGUID 12 f f f t f i 2 1114 "1114 1186" 100 0 0 100  timestamp_pl_span - _null_ ));
+DATA(insert OID = 2032 (  timestamp_pl_span PGNSP PGUID 12 f f t f i 2 1114 "1114 1186"  timestamp_pl_span - _null_ ));
 DESCR("plus");
-DATA(insert OID = 2033 (  timestamp_mi_span PGNSP PGUID 12 f f f t f i 2 1114 "1114 1186" 100 0 0 100  timestamp_mi_span - _null_ ));
+DATA(insert OID = 2033 (  timestamp_mi_span PGNSP PGUID 12 f f t f i 2 1114 "1114 1186"  timestamp_mi_span - _null_ ));
 DESCR("minus");
-DATA(insert OID = 2034 (  text				PGNSP PGUID 12 f f t t f s 1   25 "1114" 100 0 0 100  timestamp_text - _null_ ));
+DATA(insert OID = 2034 (  text				PGNSP PGUID 12 f f t f s 1   25 "1114"  timestamp_text - _null_ ));
 DESCR("convert timestamp to text");
-DATA(insert OID = 2035 (  timestamp_smaller PGNSP PGUID 12 f f f t f i 2 1114 "1114 1114" 100 0 0 100  timestamp_smaller - _null_ ));
+DATA(insert OID = 2035 (  timestamp_smaller PGNSP PGUID 12 f f t f i 2 1114 "1114 1114"  timestamp_smaller - _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 2036 (  timestamp_larger	PGNSP PGUID 12 f f f t f i 2 1114 "1114 1114" 100 0 0 100  timestamp_larger - _null_ ));
+DATA(insert OID = 2036 (  timestamp_larger	PGNSP PGUID 12 f f t f i 2 1114 "1114 1114"  timestamp_larger - _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 2037 (  timezone			PGNSP PGUID 12 f f f t f s 2 1266 "25 1266" 100 0 0 100  timetz_zone - _null_ ));
+DATA(insert OID = 2037 (  timezone			PGNSP PGUID 12 f f t f s 2 1266 "25 1266"  timetz_zone - _null_ ));
 DESCR("time with time zone");
-DATA(insert OID = 2038 (  timezone			PGNSP PGUID 12 f f f t f i 2 1266 "1186 1266" 100 0 0 100  timetz_izone - _null_ ));
+DATA(insert OID = 2038 (  timezone			PGNSP PGUID 12 f f t f i 2 1266 "1186 1266"  timetz_izone - _null_ ));
 DESCR("time with time zone");
-DATA(insert OID = 2041 ( overlaps			PGNSP PGUID 12 f f f f f i 4 16 "1114 1114 1114 1114" 100 0 0 100  overlaps_timestamp - _null_ ));
+DATA(insert OID = 2041 ( overlaps			PGNSP PGUID 12 f f f f i 4 16 "1114 1114 1114 1114"  overlaps_timestamp - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 2042 ( overlaps			PGNSP PGUID 14 f f f f f i 4 16 "1114 1186 1114 1186" 100 0 0 100  "select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ ));
+DATA(insert OID = 2042 ( overlaps			PGNSP PGUID 14 f f f f i 4 16 "1114 1186 1114 1186"  "select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 2043 ( overlaps			PGNSP PGUID 14 f f f f f i 4 16 "1114 1114 1114 1186" 100 0 0 100  "select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ ));
+DATA(insert OID = 2043 ( overlaps			PGNSP PGUID 14 f f f f i 4 16 "1114 1114 1114 1186"  "select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 2044 ( overlaps			PGNSP PGUID 14 f f f f f i 4 16 "1114 1186 1114 1114" 100 0 0 100  "select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ ));
+DATA(insert OID = 2044 ( overlaps			PGNSP PGUID 14 f f f f i 4 16 "1114 1186 1114 1114"  "select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ ));
 DESCR("SQL92 interval comparison");
-DATA(insert OID = 2045 (  timestamp_cmp		PGNSP PGUID 12 f f f t f i 2	23 "1114 1114" 100 0 0 100	timestamp_cmp - _null_ ));
+DATA(insert OID = 2045 (  timestamp_cmp		PGNSP PGUID 12 f f t f i 2	23 "1114 1114"	timestamp_cmp - _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 2046 (  time				PGNSP PGUID 12 f f t t f i 1 1083 "1266" 100 0 0 100  timetz_time - _null_ ));
+DATA(insert OID = 2046 (  time				PGNSP PGUID 12 f f t f i 1 1083 "1266"  timetz_time - _null_ ));
 DESCR("convert time with time zone to time");
-DATA(insert OID = 2047 (  timetz			PGNSP PGUID 12 f f t t f s 1 1266 "1083" 100 0 0 100  time_timetz - _null_ ));
+DATA(insert OID = 2047 (  timetz			PGNSP PGUID 12 f f t f s 1 1266 "1083"  time_timetz - _null_ ));
 DESCR("convert time to timetz");
-DATA(insert OID = 2048 (  isfinite			PGNSP PGUID 12 f f f t f i 1   16 "1114" 100 0 0 100  timestamp_finite - _null_ ));
+DATA(insert OID = 2048 (  isfinite			PGNSP PGUID 12 f f t f i 1   16 "1114"  timestamp_finite - _null_ ));
 DESCR("boolean test");
-DATA(insert OID = 2049 ( to_char			PGNSP PGUID 12 f f f t f s 2	25 "1114 25" 100 0 0 100  timestamp_to_char - _null_ ));
+DATA(insert OID = 2049 ( to_char			PGNSP PGUID 12 f f t f s 2	25 "1114 25"  timestamp_to_char - _null_ ));
 DESCR("format timestamp to text");
-DATA(insert OID = 2050 ( interval_mi_time	PGNSP PGUID 14 f f f t f i 2 1083 "1186 1083" 100 0 0 100  "select $2 - $1" - _null_ ));
+DATA(insert OID = 2050 ( interval_mi_time	PGNSP PGUID 14 f f t f i 2 1083 "1186 1083"  "select $2 - $1" - _null_ ));
 DESCR("minus");
-DATA(insert OID = 2051 ( interval_mi_timetz PGNSP PGUID 14 f f f t f i 2 1266 "1186 1266" 100 0 0 100  "select $2 - $1" - _null_ ));
+DATA(insert OID = 2051 ( interval_mi_timetz PGNSP PGUID 14 f f t f i 2 1266 "1186 1266"  "select $2 - $1" - _null_ ));
 DESCR("minus");
-DATA(insert OID = 2052 (  timestamp_eq		PGNSP PGUID 12 f f f t f i 2 16 "1114 1114" 100 0 0 100  timestamp_eq - _null_ ));
+DATA(insert OID = 2052 (  timestamp_eq		PGNSP PGUID 12 f f t f i 2 16 "1114 1114"  timestamp_eq - _null_ ));
 DESCR("equal");
-DATA(insert OID = 2053 (  timestamp_ne		PGNSP PGUID 12 f f f t f i 2 16 "1114 1114" 100 0 0 100  timestamp_ne - _null_ ));
+DATA(insert OID = 2053 (  timestamp_ne		PGNSP PGUID 12 f f t f i 2 16 "1114 1114"  timestamp_ne - _null_ ));
 DESCR("not equal");
-DATA(insert OID = 2054 (  timestamp_lt		PGNSP PGUID 12 f f f t f i 2 16 "1114 1114" 100 0 0 100  timestamp_lt - _null_ ));
+DATA(insert OID = 2054 (  timestamp_lt		PGNSP PGUID 12 f f t f i 2 16 "1114 1114"  timestamp_lt - _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2055 (  timestamp_le		PGNSP PGUID 12 f f f t f i 2 16 "1114 1114" 100 0 0 100  timestamp_le - _null_ ));
+DATA(insert OID = 2055 (  timestamp_le		PGNSP PGUID 12 f f t f i 2 16 "1114 1114"  timestamp_le - _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2056 (  timestamp_ge		PGNSP PGUID 12 f f f t f i 2 16 "1114 1114" 100 0 0 100  timestamp_ge - _null_ ));
+DATA(insert OID = 2056 (  timestamp_ge		PGNSP PGUID 12 f f t f i 2 16 "1114 1114"  timestamp_ge - _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2057 (  timestamp_gt		PGNSP PGUID 12 f f f t f i 2 16 "1114 1114" 100 0 0 100  timestamp_gt - _null_ ));
+DATA(insert OID = 2057 (  timestamp_gt		PGNSP PGUID 12 f f t f i 2 16 "1114 1114"  timestamp_gt - _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2058 (  age				PGNSP PGUID 12 f f f t f i 2 1186 "1114 1114" 100 0 0 100  timestamp_age - _null_ ));
+DATA(insert OID = 2058 (  age				PGNSP PGUID 12 f f t f i 2 1186 "1114 1114"  timestamp_age - _null_ ));
 DESCR("date difference preserving months and years");
-DATA(insert OID = 2059 (  age				PGNSP PGUID 14 f f f t f s 1 1186 "1114" 100 0 0 100  "select age(cast(current_date as timestamp without time zone), $1)" - _null_ ));
+DATA(insert OID = 2059 (  age				PGNSP PGUID 14 f f t f s 1 1186 "1114"  "select age(cast(current_date as timestamp without time zone), $1)" - _null_ ));
 DESCR("date difference from today preserving months and years");
 
-DATA(insert OID = 2069 (  timezone			PGNSP PGUID 12 f f f t f s 2 1184 "25 1114" 100 0 0 100  timestamp_zone - _null_ ));
+DATA(insert OID = 2069 (  timezone			PGNSP PGUID 12 f f t f s 2 1184 "25 1114"  timestamp_zone - _null_ ));
 DESCR("timestamp at a specified time zone");
-DATA(insert OID = 2070 (  timezone			PGNSP PGUID 12 f f f t f s 2 1184 "1186 1114" 100 0 0 100  timestamp_izone - _null_ ));
+DATA(insert OID = 2070 (  timezone			PGNSP PGUID 12 f f t f s 2 1184 "1186 1114"  timestamp_izone - _null_ ));
 DESCR("time zone");
-DATA(insert OID = 2071 (  date_pl_interval	PGNSP PGUID 14 f f f t f i 2 1114 "1082 1186" 100 0 0 100  "select cast($1 as timestamp without time zone) + $2;" - _null_ ));
+DATA(insert OID = 2071 (  date_pl_interval	PGNSP PGUID 14 f f t f i 2 1114 "1082 1186"  "select cast($1 as timestamp without time zone) + $2;" - _null_ ));
 DESCR("add");
-DATA(insert OID = 2072 (  date_mi_interval	PGNSP PGUID 14 f f f t f i 2 1114 "1082 1186" 100 0 0 100  "select cast($1 as timestamp without time zone) - $2;" - _null_ ));
+DATA(insert OID = 2072 (  date_mi_interval	PGNSP PGUID 14 f f t f i 2 1114 "1082 1186"  "select cast($1 as timestamp without time zone) - $2;" - _null_ ));
 DESCR("subtract");
 
-DATA(insert OID = 2073 (  substring			PGNSP PGUID 12 f f f t f i 2 25 "25 25" 100 0 0 100	textregexsubstr - _null_ ));
+DATA(insert OID = 2073 (  substring			PGNSP PGUID 12 f f t f i 2 25 "25 25"	textregexsubstr - _null_ ));
 DESCR("substitutes regular expression");
-DATA(insert OID = 2074 (  substring			PGNSP PGUID 14 f f f t f i 3 25 "25 25 25" 100 0 0 100	"select substring($1, like_escape($2, $3))" - _null_ ));
+DATA(insert OID = 2074 (  substring			PGNSP PGUID 14 f f t f i 3 25 "25 25 25"	"select substring($1, like_escape($2, $3))" - _null_ ));
 DESCR("substitutes regular expression with escape argument");
 
-DATA(insert OID = 2090 (  current_setting	PGNSP PGUID 12 f f f t f s 1 25 "25" 100 0 0 100 show_config_by_name - _null_ ));
+DATA(insert OID = 2090 (  current_setting	PGNSP PGUID 12 f f t f s 1 25 "25" show_config_by_name - _null_ ));
 DESCR("SHOW X as a function");
-DATA(insert OID = 2091 (  set_config		PGNSP PGUID 12 f f f f f v 3 25 "25 25 16" 100 0 0 100 set_config_by_name - _null_ ));
+DATA(insert OID = 2091 (  set_config		PGNSP PGUID 12 f f f f v 3 25 "25 25 16" set_config_by_name - _null_ ));
 DESCR("SET X as a function");
 
 /* Aggregates (moved here from pg_aggregate for 7.3) */
 
-DATA(insert OID = 2100 (  avg				PGNSP PGUID 12 t f f f f i 1 1700 "20" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2101 (  avg				PGNSP PGUID 12 t f f f f i 1 1700 "23" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2102 (  avg				PGNSP PGUID 12 t f f f f i 1 1700 "21" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2103 (  avg				PGNSP PGUID 12 t f f f f i 1 1700 "1700" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2104 (  avg				PGNSP PGUID 12 t f f f f i 1 701 "700" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2105 (  avg				PGNSP PGUID 12 t f f f f i 1 701 "701" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2106 (  avg				PGNSP PGUID 12 t f f f f i 1 1186 "1186" 100 0 0 100  aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2107 (  sum				PGNSP PGUID 12 t f f f f i 1 1700 "20" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2108 (  sum				PGNSP PGUID 12 t f f f f i 1 20 "23" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2109 (  sum				PGNSP PGUID 12 t f f f f i 1 20 "21" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2110 (  sum				PGNSP PGUID 12 t f f f f i 1 700 "700" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2111 (  sum				PGNSP PGUID 12 t f f f f i 1 701 "701" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2112 (  sum				PGNSP PGUID 12 t f f f f i 1 790 "790" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2113 (  sum				PGNSP PGUID 12 t f f f f i 1 1186 "1186" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2114 (  sum				PGNSP PGUID 12 t f f f f i 1 1700 "1700" 100 0 0 100  aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2115 (  max				PGNSP PGUID 12 t f f f f i 1 20 "20" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2116 (  max				PGNSP PGUID 12 t f f f f i 1 23 "23" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2117 (  max				PGNSP PGUID 12 t f f f f i 1 21 "21" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2118 (  max				PGNSP PGUID 12 t f f f f i 1 26 "26" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2119 (  max				PGNSP PGUID 12 t f f f f i 1 700 "700" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2120 (  max				PGNSP PGUID 12 t f f f f i 1 701 "701" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2121 (  max				PGNSP PGUID 12 t f f f f i 1 702 "702" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2122 (  max				PGNSP PGUID 12 t f f f f i 1 1082 "1082" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2123 (  max				PGNSP PGUID 12 t f f f f i 1 1083 "1083" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2124 (  max				PGNSP PGUID 12 t f f f f i 1 1266 "1266" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2125 (  max				PGNSP PGUID 12 t f f f f i 1 790 "790" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2126 (  max				PGNSP PGUID 12 t f f f f i 1 1114 "1114" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2127 (  max				PGNSP PGUID 12 t f f f f i 1 1184 "1184" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2128 (  max				PGNSP PGUID 12 t f f f f i 1 1186 "1186" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2129 (  max				PGNSP PGUID 12 t f f f f i 1 25 "25" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2130 (  max				PGNSP PGUID 12 t f f f f i 1 1700 "1700" 100 0 0 100  aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2131 (  min				PGNSP PGUID 12 t f f f f i 1 20 "20" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2132 (  min				PGNSP PGUID 12 t f f f f i 1 23 "23" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2133 (  min				PGNSP PGUID 12 t f f f f i 1 21 "21" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2134 (  min				PGNSP PGUID 12 t f f f f i 1 26 "26" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2135 (  min				PGNSP PGUID 12 t f f f f i 1 700 "700" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2136 (  min				PGNSP PGUID 12 t f f f f i 1 701 "701" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2137 (  min				PGNSP PGUID 12 t f f f f i 1 702 "702" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2138 (  min				PGNSP PGUID 12 t f f f f i 1 1082 "1082" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2139 (  min				PGNSP PGUID 12 t f f f f i 1 1083 "1083" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2140 (  min				PGNSP PGUID 12 t f f f f i 1 1266 "1266" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2141 (  min				PGNSP PGUID 12 t f f f f i 1 790 "790" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2142 (  min				PGNSP PGUID 12 t f f f f i 1 1114 "1114" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2143 (  min				PGNSP PGUID 12 t f f f f i 1 1184 "1184" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2144 (  min				PGNSP PGUID 12 t f f f f i 1 1186 "1186" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2145 (  min				PGNSP PGUID 12 t f f f f i 1 25 "25" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2146 (  min				PGNSP PGUID 12 t f f f f i 1 1700 "1700" 100 0 0 100  aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2147 (  count				PGNSP PGUID 12 t f f f f i 1 20 "0" 100 0 0 100  aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2148 (  variance			PGNSP PGUID 12 t f f f f i 1 1700 "20" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2149 (  variance			PGNSP PGUID 12 t f f f f i 1 1700 "23" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2150 (  variance			PGNSP PGUID 12 t f f f f i 1 1700 "21" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2151 (  variance			PGNSP PGUID 12 t f f f f i 1 701 "700" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2152 (  variance			PGNSP PGUID 12 t f f f f i 1 701 "701" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2153 (  variance			PGNSP PGUID 12 t f f f f i 1 1700 "1700" 100 0 0 100  aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2154 (  stddev			PGNSP PGUID 12 t f f f f i 1 1700 "20" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2155 (  stddev			PGNSP PGUID 12 t f f f f i 1 1700 "23" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2156 (  stddev			PGNSP PGUID 12 t f f f f i 1 1700 "21" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2157 (  stddev			PGNSP PGUID 12 t f f f f i 1 701 "700" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2158 (  stddev			PGNSP PGUID 12 t f f f f i 1 701 "701" 100 0 0 100  aggregate_dummy - _null_ ));
-DATA(insert OID = 2159 (  stddev			PGNSP PGUID 12 t f f f f i 1 1700 "1700" 100 0 0 100  aggregate_dummy - _null_ ));
-
-
-DATA(insert OID = 2212 (  regprocedurein	PGNSP PGUID 12 f f f t f s 1 2202 "0" 100 0 0 100	regprocedurein - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2213 (  regprocedureout	PGNSP PGUID 12 f f f t f s 1   23 "0" 100 0 0 100	regprocedureout - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2214 (  regoperin			PGNSP PGUID 12 f f f t f s 1 2203 "0" 100 0 0 100	regoperin - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2215 (  regoperout		PGNSP PGUID 12 f f f t f s 1   23 "0" 100 0 0 100	regoperout - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2216 (  regoperatorin		PGNSP PGUID 12 f f f t f s 1 2204 "0" 100 0 0 100	regoperatorin - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2217 (  regoperatorout	PGNSP PGUID 12 f f f t f s 1   23 "0" 100 0 0 100	regoperatorout - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2218 (  regclassin		PGNSP PGUID 12 f f f t f s 1 2205 "0" 100 0 0 100	regclassin - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2219 (  regclassout		PGNSP PGUID 12 f f f t f s 1   23 "0" 100 0 0 100	regclassout - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2220 (  regtypein			PGNSP PGUID 12 f f f t f s 1 2206 "0" 100 0 0 100	regtypein - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2221 (  regtypeout		PGNSP PGUID 12 f f f t f s 1   23 "0" 100 0 0 100	regtypeout - _null_ ));
-DESCR("(internal)");
-
-DATA(insert OID = 2246 ( fmgr_internal_validator PGNSP PGUID 12 f f f t f s 1 26 "23" 100 0 0 100 fmgr_internal_validator - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2247 ( fmgr_c_validator	PGNSP PGUID 12 f f f t f s 1   26 "23" 100 0 0 100	fmgr_c_validator - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 2248 ( fmgr_sql_validator	PGNSP PGUID 12 f f f t f s 1   26 "23" 100 0 0 100	fmgr_sql_validator - _null_ ));
+DATA(insert OID = 2100 (  avg				PGNSP PGUID 12 t f f f i 1 1700 "20"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2101 (  avg				PGNSP PGUID 12 t f f f i 1 1700 "23"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2102 (  avg				PGNSP PGUID 12 t f f f i 1 1700 "21"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2103 (  avg				PGNSP PGUID 12 t f f f i 1 1700 "1700"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2104 (  avg				PGNSP PGUID 12 t f f f i 1 701 "700"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2105 (  avg				PGNSP PGUID 12 t f f f i 1 701 "701"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2106 (  avg				PGNSP PGUID 12 t f f f i 1 1186 "1186"  aggregate_dummy - _null_ ));
+
+DATA(insert OID = 2107 (  sum				PGNSP PGUID 12 t f f f i 1 1700 "20"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2108 (  sum				PGNSP PGUID 12 t f f f i 1 20 "23"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2109 (  sum				PGNSP PGUID 12 t f f f i 1 20 "21"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2110 (  sum				PGNSP PGUID 12 t f f f i 1 700 "700"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2111 (  sum				PGNSP PGUID 12 t f f f i 1 701 "701"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2112 (  sum				PGNSP PGUID 12 t f f f i 1 790 "790"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2113 (  sum				PGNSP PGUID 12 t f f f i 1 1186 "1186"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2114 (  sum				PGNSP PGUID 12 t f f f i 1 1700 "1700"  aggregate_dummy - _null_ ));
+
+DATA(insert OID = 2115 (  max				PGNSP PGUID 12 t f f f i 1 20 "20"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2116 (  max				PGNSP PGUID 12 t f f f i 1 23 "23"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2117 (  max				PGNSP PGUID 12 t f f f i 1 21 "21"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2118 (  max				PGNSP PGUID 12 t f f f i 1 26 "26"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2119 (  max				PGNSP PGUID 12 t f f f i 1 700 "700"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2120 (  max				PGNSP PGUID 12 t f f f i 1 701 "701"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2121 (  max				PGNSP PGUID 12 t f f f i 1 702 "702"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2122 (  max				PGNSP PGUID 12 t f f f i 1 1082 "1082"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2123 (  max				PGNSP PGUID 12 t f f f i 1 1083 "1083"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2124 (  max				PGNSP PGUID 12 t f f f i 1 1266 "1266"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2125 (  max				PGNSP PGUID 12 t f f f i 1 790 "790"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2126 (  max				PGNSP PGUID 12 t f f f i 1 1114 "1114"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2127 (  max				PGNSP PGUID 12 t f f f i 1 1184 "1184"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2128 (  max				PGNSP PGUID 12 t f f f i 1 1186 "1186"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2129 (  max				PGNSP PGUID 12 t f f f i 1 25 "25"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2130 (  max				PGNSP PGUID 12 t f f f i 1 1700 "1700"  aggregate_dummy - _null_ ));
+
+DATA(insert OID = 2131 (  min				PGNSP PGUID 12 t f f f i 1 20 "20"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2132 (  min				PGNSP PGUID 12 t f f f i 1 23 "23"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2133 (  min				PGNSP PGUID 12 t f f f i 1 21 "21"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2134 (  min				PGNSP PGUID 12 t f f f i 1 26 "26"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2135 (  min				PGNSP PGUID 12 t f f f i 1 700 "700"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2136 (  min				PGNSP PGUID 12 t f f f i 1 701 "701"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2137 (  min				PGNSP PGUID 12 t f f f i 1 702 "702"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2138 (  min				PGNSP PGUID 12 t f f f i 1 1082 "1082"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2139 (  min				PGNSP PGUID 12 t f f f i 1 1083 "1083"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2140 (  min				PGNSP PGUID 12 t f f f i 1 1266 "1266"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2141 (  min				PGNSP PGUID 12 t f f f i 1 790 "790"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2142 (  min				PGNSP PGUID 12 t f f f i 1 1114 "1114"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2143 (  min				PGNSP PGUID 12 t f f f i 1 1184 "1184"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2144 (  min				PGNSP PGUID 12 t f f f i 1 1186 "1186"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2145 (  min				PGNSP PGUID 12 t f f f i 1 25 "25"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2146 (  min				PGNSP PGUID 12 t f f f i 1 1700 "1700"  aggregate_dummy - _null_ ));
+
+DATA(insert OID = 2147 (  count				PGNSP PGUID 12 t f f f i 1 20 "0"  aggregate_dummy - _null_ ));
+
+DATA(insert OID = 2148 (  variance			PGNSP PGUID 12 t f f f i 1 1700 "20"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2149 (  variance			PGNSP PGUID 12 t f f f i 1 1700 "23"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2150 (  variance			PGNSP PGUID 12 t f f f i 1 1700 "21"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2151 (  variance			PGNSP PGUID 12 t f f f i 1 701 "700"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2152 (  variance			PGNSP PGUID 12 t f f f i 1 701 "701"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2153 (  variance			PGNSP PGUID 12 t f f f i 1 1700 "1700"  aggregate_dummy - _null_ ));
+
+DATA(insert OID = 2154 (  stddev			PGNSP PGUID 12 t f f f i 1 1700 "20"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2155 (  stddev			PGNSP PGUID 12 t f f f i 1 1700 "23"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2156 (  stddev			PGNSP PGUID 12 t f f f i 1 1700 "21"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2157 (  stddev			PGNSP PGUID 12 t f f f i 1 701 "700"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2158 (  stddev			PGNSP PGUID 12 t f f f i 1 701 "701"  aggregate_dummy - _null_ ));
+DATA(insert OID = 2159 (  stddev			PGNSP PGUID 12 t f f f i 1 1700 "1700"  aggregate_dummy - _null_ ));
+
+
+DATA(insert OID = 2212 (  regprocedurein	PGNSP PGUID 12 f f t f s 1 2202 "0"	regprocedurein - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2213 (  regprocedureout	PGNSP PGUID 12 f f t f s 1   23 "0"	regprocedureout - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2214 (  regoperin			PGNSP PGUID 12 f f t f s 1 2203 "0"	regoperin - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2215 (  regoperout		PGNSP PGUID 12 f f t f s 1   23 "0"	regoperout - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2216 (  regoperatorin		PGNSP PGUID 12 f f t f s 1 2204 "0"	regoperatorin - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2217 (  regoperatorout	PGNSP PGUID 12 f f t f s 1   23 "0"	regoperatorout - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2218 (  regclassin		PGNSP PGUID 12 f f t f s 1 2205 "0"	regclassin - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2219 (  regclassout		PGNSP PGUID 12 f f t f s 1   23 "0"	regclassout - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2220 (  regtypein			PGNSP PGUID 12 f f t f s 1 2206 "0"	regtypein - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2221 (  regtypeout		PGNSP PGUID 12 f f t f s 1   23 "0"	regtypeout - _null_ ));
+DESCR("(internal)");
+
+DATA(insert OID = 2246 ( fmgr_internal_validator PGNSP PGUID 12 f f t f s 1 26 "23" fmgr_internal_validator - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2247 ( fmgr_c_validator	PGNSP PGUID 12 f f t f s 1   26 "23"	fmgr_c_validator - _null_ ));
+DESCR("(internal)");
+DATA(insert OID = 2248 ( fmgr_sql_validator	PGNSP PGUID 12 f f t f s 1   26 "23"	fmgr_sql_validator - _null_ ));
 DESCR("(internal)");
 #define SQLvalidatorId 2248
 
@@ -3014,10 +3004,6 @@ extern Oid 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);
 
diff --git a/src/include/catalog/pg_shadow.h b/src/include/catalog/pg_shadow.h
index f56a024c464..6352f4b30d1 100644
--- 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
 
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index da41ac67db3..1f801611a05 100644
--- 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,
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index e4c6b625d11..842a0b93d79 100644
--- 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;
 
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 1870310b783..e478b77a2bc 100644
--- 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
diff --git a/src/test/regress/expected/oidjoins.out b/src/test/regress/expected/oidjoins.out
index 21c1c519f26..8fdd18e18d0 100644
--- 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)
-
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 967a36de22f..207499aff9e 100644
--- 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);
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index a625054bad0..711628c2e40 100644
--- 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
diff --git a/src/test/regress/sql/oidjoins.sql b/src/test/regress/sql/oidjoins.sql
index bf638be3d13..cd476d87bd5 100644
--- 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);
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index ca2d24c00a6..87bcad19793 100644
--- 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
-- 
GitLab