diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 17734769f9d67d5c98adebfd88eba519986ba3bc..c2a1bb2684e607fca8b00cf891adcc7524632a71 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_operator.h,v 1.50 1999/02/28 00:56:40 tgl Exp $
+ * $Id: pg_operator.h,v 1.51 1999/03/10 05:02:31 tgl Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -614,7 +614,7 @@ DATA(insert OID = 1567 ( "##" PGUID 0 b t f 601 603 600 0 0 0 0 close_s
DATA(insert OID = 1568 ( "##" PGUID 0 b t f 628 603 600 0 0 0 0 close_lb - - ));
DATA(insert OID = 1577 ( "##" PGUID 0 b t f 628 601 600 0 0 0 0 close_ls - - ));
DATA(insert OID = 1578 ( "##" PGUID 0 b t f 601 601 600 0 0 0 0 close_lseg - - ));
-DATA(insert OID = 1585 ( "/" PGUID 0 b t f 1186 1186 1186 0 0 0 0 timespan_div - - ));
+DATA(insert OID = 1585 ( "/" PGUID 0 b t f 1186 701 1186 0 0 0 0 timespan_div - - ));
DATA(insert OID = 1586 ( "<>" PGUID 0 b t f 601 601 16 1586 1535 0 0 lseg_ne intltsel - ));
DATA(insert OID = 1587 ( "<" PGUID 0 b t f 601 601 16 1589 1590 0 0 lseg_lt intltsel - ));
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 01eec34c9c108e239ec264cddffdf7822191f9bf..a71f1ef52610fc628e23e7033c6122a82b26374e 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_proc.h,v 1.89 1999/02/13 23:21:12 momjian Exp $
+ * $Id: pg_proc.h,v 1.90 1999/03/10 05:02:33 tgl Exp $
*
* NOTES
* The script catalog/genbki.sh reads this file and generates .bki
@@ -331,29 +331,29 @@ DATA(insert OID = 156 ( int4mod PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100
DESCR("modulus");
DATA(insert OID = 157 ( textne PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar ));
DESCR("not equal");
-DATA(insert OID = 158 ( int24eq PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100 foo bar ));
+DATA(insert OID = 158 ( int24eq PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100 foo bar ));
DESCR("equal");
-DATA(insert OID = 159 ( int42eq PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100 foo bar ));
+DATA(insert OID = 159 ( int42eq PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100 foo bar ));
DESCR("equal");
-DATA(insert OID = 160 ( int24lt PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100 foo bar ));
+DATA(insert OID = 160 ( int24lt PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100 foo bar ));
DESCR("less-than");
-DATA(insert OID = 161 ( int42lt PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100 foo bar ));
+DATA(insert OID = 161 ( int42lt PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100 foo bar ));
DESCR("less-than");
-DATA(insert OID = 162 ( int24gt PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100 foo bar ));
+DATA(insert OID = 162 ( int24gt PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100 foo bar ));
DESCR("greater-than");
-DATA(insert OID = 163 ( int42gt PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100 foo bar ));
+DATA(insert OID = 163 ( int42gt PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100 foo bar ));
DESCR("greater-than");
-DATA(insert OID = 164 ( int24ne PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100 foo bar ));
+DATA(insert OID = 164 ( int24ne PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100 foo bar ));
DESCR("not equal");
-DATA(insert OID = 165 ( int42ne PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100 foo bar ));
+DATA(insert OID = 165 ( int42ne PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100 foo bar ));
DESCR("not equal");
-DATA(insert OID = 166 ( int24le PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100 foo bar ));
+DATA(insert OID = 166 ( int24le PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100 foo bar ));
DESCR("less-than-or-equal");
-DATA(insert OID = 167 ( int42le PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100 foo bar ));
+DATA(insert OID = 167 ( int42le PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100 foo bar ));
DESCR("less-than-or-equal");
-DATA(insert OID = 168 ( int24ge PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100 foo bar ));
+DATA(insert OID = 168 ( int24ge PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100 foo bar ));
DESCR("greater-than-or-equal");
-DATA(insert OID = 169 ( int42ge PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100 foo bar ));
+DATA(insert OID = 169 ( int42ge PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100 foo bar ));
DESCR("greater-than-or-equal");
DATA(insert OID = 170 ( int24mul PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100 foo bar ));
DESCR("multiply");
@@ -893,7 +893,7 @@ DESCR("convert float8 to int8");
/* OIDS 600 - 699 */
-DATA(insert OID = 1285 ( int4notin PGUID 11 f t f 2 f 16 "21 0" 100 0 0 100 foo bar ));
+DATA(insert OID = 1285 ( int4notin PGUID 11 f t f 2 f 16 "23 0" 100 0 0 100 foo bar ));
DESCR("not in");
DATA(insert OID = 1286 ( oidnotin PGUID 11 f t f 2 f 16 "26 0" 100 0 0 100 foo bar ));
DESCR("not in");
@@ -1096,17 +1096,17 @@ DESCR("matches LIKE expression");
DATA(insert OID = 851 ( textnlike PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar ));
DESCR("does not match LIKE expression");
-DATA(insert OID = 852 ( int48eq PGUID 11 f t f 2 f 16 "21 20" 100 0 0 100 foo bar ));
+DATA(insert OID = 852 ( int48eq PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100 foo bar ));
DESCR("equal");
-DATA(insert OID = 853 ( int48ne PGUID 11 f t f 2 f 16 "21 20" 100 0 0 100 foo bar ));
+DATA(insert OID = 853 ( int48ne PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100 foo bar ));
DESCR("not equal");
-DATA(insert OID = 854 ( int48lt PGUID 11 f t f 2 f 16 "21 20" 100 0 0 100 foo bar ));
+DATA(insert OID = 854 ( int48lt PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100 foo bar ));
DESCR("less-than");
-DATA(insert OID = 855 ( int48gt PGUID 11 f t f 2 f 16 "21 20" 100 0 0 100 foo bar ));
+DATA(insert OID = 855 ( int48gt PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100 foo bar ));
DESCR("greater-than");
-DATA(insert OID = 856 ( int48le PGUID 11 f t f 2 f 16 "21 20" 100 0 0 100 foo bar ));
+DATA(insert OID = 856 ( int48le PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100 foo bar ));
DESCR("less-than-or-equal");
-DATA(insert OID = 857 ( int48ge PGUID 11 f t f 2 f 16 "21 20" 100 0 0 100 foo bar ));
+DATA(insert OID = 857 ( int48ge PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100 foo bar ));
DESCR("greater-than-or-equal");
DATA(insert OID = 858 ( namelike PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100 foo bar ));
@@ -1861,7 +1861,7 @@ DATA(insert OID = 1474 ( poly_circle PGUID 11 f t f 1 f 718 "604" 100 0 1 0 fo
DESCR("convert polygon to circle");
DATA(insert OID = 1475 ( circle_poly PGUID 11 f t f 2 f 604 "23 718" 100 0 1 0 foo bar ));
DESCR("convert vertex count and circle to polygon");
-DATA(insert OID = 1476 ( dist_pc PGUID 11 f t f 2 f 604 "600 718" 100 0 1 0 foo bar ));
+DATA(insert OID = 1476 ( dist_pc PGUID 11 f t f 2 f 701 "600 718" 100 0 1 0 foo bar ));
DESCR("distance between");
DATA(insert OID = 1477 ( circle_contain_pt PGUID 11 f t f 2 f 16 "718 600" 100 0 0 100 foo bar ));
DESCR("");
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 3ce580d8a7878cda999dd8b2e09e1eacb5c94d57..a185a1912d47b1372f525016837d636cd4fb6dda 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_type.h,v 1.54 1999/02/13 23:21:15 momjian Exp $
+ * $Id: pg_type.h,v 1.55 1999/03/10 05:02:34 tgl Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -191,6 +191,8 @@ DESCR("4-byte integer, -2B to 2B");
DATA(insert OID = 24 ( regproc PGUID 4 16 t b t \054 0 0 regprocin regprocout regprocin regprocout i _null_ ));
DESCR("registered procedure");
+#define REGPROCOID 24
+
DATA(insert OID = 25 ( text PGUID -1 -1 f b t \054 0 18 textin textout textin textout i _null_ ));
DESCR("native variable-length string");
#define TEXTOID 25