diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 5ca32d0527cee0783111d389f7f7516259eec2ab..27c3c4f249a03d79cf50c03c09b0cf8806f28b99 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_aggregate.h,v 1.14 1998/02/26 04:40:44 momjian Exp $
+ * $Id: pg_aggregate.h,v 1.15 1998/07/08 14:08:58 thomas Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -88,6 +88,7 @@ typedef FormData_pg_aggregate *Form_pg_aggregate;
  * ---------------
  */
 
+DATA(insert OID = 0 ( avg	PGUID int8pl      int4inc   int84div        20   20   23   20 _null_ 0 ));
 DATA(insert OID = 0 ( avg	PGUID int4pl	  int4inc	int4div			23	 23   23   23 _null_ 0 ));
 DATA(insert OID = 0 ( avg	PGUID int2pl	  int2inc	int2div			21	 21   21   21 _null_ 0 ));
 DATA(insert OID = 0 ( avg	PGUID float4pl	  float4inc float4div	   700	700  700  700 _null_ 0.0 ));
@@ -95,34 +96,37 @@ DATA(insert OID = 0 ( avg	PGUID float8pl	  float8inc float8div	   701	701  701
 DATA(insert OID = 0 ( avg	PGUID cash_pl	  float8inc cash_div_flt8  790	790  701  790 _null_ 0.0 ));
 DATA(insert OID = 0 ( avg	PGUID timespan_pl float8inc timespan_div  1186 1186  701 1186 _null_ 0.0 ));
 
-DATA(insert OID = 0 ( sum	PGUID int4pl		- -   23   23 0   23 _null_ _null_ ));
-DATA(insert OID = 0 ( sum	PGUID int2pl		- -   21   21 0   21 _null_ _null_ ));
-DATA(insert OID = 0 ( sum	PGUID float4pl		- -  700  700 0  700 _null_ _null_ ));
-DATA(insert OID = 0 ( sum	PGUID float8pl		- -  701  701 0  701 _null_ _null_ ));
-DATA(insert OID = 0 ( sum	PGUID cash_pl		- -  790  790 0  790 _null_ _null_ ));
-DATA(insert OID = 0 ( sum	PGUID timespan_pl	- -  1186 1186 0 1186 _null_ _null_ ));
+DATA(insert OID = 0 ( sum	PGUID int8pl			- -   20   20 0   20 _null_ _null_ ));
+DATA(insert OID = 0 ( sum	PGUID int4pl			- -   23   23 0   23 _null_ _null_ ));
+DATA(insert OID = 0 ( sum	PGUID int2pl			- -   21   21 0   21 _null_ _null_ ));
+DATA(insert OID = 0 ( sum	PGUID float4pl			- -  700  700 0  700 _null_ _null_ ));
+DATA(insert OID = 0 ( sum	PGUID float8pl			- -  701  701 0  701 _null_ _null_ ));
+DATA(insert OID = 0 ( sum	PGUID cash_pl			- -  790  790 0  790 _null_ _null_ ));
+DATA(insert OID = 0 ( sum	PGUID timespan_pl		- - 1186 1186 0 1186 _null_ _null_ ));
 
-DATA(insert OID = 0 ( max	PGUID int4larger	  - -	23	 23 0	23 _null_ _null_ ));
-DATA(insert OID = 0 ( max	PGUID int2larger	  - -	21	 21 0	21 _null_ _null_ ));
-DATA(insert OID = 0 ( max	PGUID float4larger	  - -  700	700 0  700 _null_ _null_ ));
-DATA(insert OID = 0 ( max	PGUID float8larger	  - -  701	701 0  701 _null_ _null_ ));
-DATA(insert OID = 0 ( max	PGUID int4larger	  - -  702	702 0  702 _null_ _null_ ));
-DATA(insert OID = 0 ( max	PGUID date_larger	  - - 1082 1082 0 1082 _null_ _null_ ));
-DATA(insert OID = 0 ( max	PGUID float8larger	  - - 1084 1084 0 1084 _null_ _null_ ));
-DATA(insert OID = 0 ( max	PGUID cashlarger	  - -  790	790 0  790 _null_ _null_ ));
-DATA(insert OID = 0 ( max	PGUID datetime_larger - - 1184 1184 0 1184 _null_ _null_ ));
-DATA(insert OID = 0 ( max	PGUID timespan_larger - - 1186 1186 0 1186 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID int8larger		- -   20   20 0   20 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID int4larger		- -   23   23 0   23 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID int2larger		- -   21   21 0   21 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID float4larger		- -  700  700 0  700 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID float8larger		- -  701  701 0  701 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID int4larger		- -  702  702 0  702 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID date_larger		- - 1082 1082 0 1082 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID float8larger		- - 1084 1084 0 1084 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID cashlarger		- -  790  790 0  790 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID datetime_larger	- - 1184 1184 0 1184 _null_ _null_ ));
+DATA(insert OID = 0 ( max	PGUID timespan_larger	- - 1186 1186 0 1186 _null_ _null_ ));
 
-DATA(insert OID = 0 ( min	PGUID int4smaller	   - -	 23   23 0	 23 _null_ _null_ ));
-DATA(insert OID = 0 ( min	PGUID int2smaller	   - -	 21   21 0	 21 _null_ _null_ ));
-DATA(insert OID = 0 ( min	PGUID float4smaller    - -	700  700 0	700 _null_ _null_ ));
-DATA(insert OID = 0 ( min	PGUID float8smaller    - -	701  701 0	701 _null_ _null_ ));
-DATA(insert OID = 0 ( min	PGUID int4smaller	   - -	702  702 0	702 _null_ _null_ ));
-DATA(insert OID = 0 ( min	PGUID date_smaller	   - - 1082 1082 0 1082 _null_ _null_ ));
-DATA(insert OID = 0 ( min	PGUID float8smaller    - - 1084 1084 0 1084 _null_ _null_ ));
-DATA(insert OID = 0 ( min	PGUID cashsmaller	   - -	790  790 0	790 _null_ _null_ ));
-DATA(insert OID = 0 ( min	PGUID datetime_smaller - - 1184 1184 0 1184 _null_ _null_ ));
-DATA(insert OID = 0 ( min	PGUID timespan_smaller - - 1186 1186 0 1186 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID int8smaller		- -   20   20 0   20 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID int4smaller		- -   23   23 0   23 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID int2smaller		- -   21   21 0   21 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID float4smaller		- -  700  700 0  700 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID float8smaller		- -  701  701 0  701 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID int4smaller		- -  702  702 0  702 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID date_smaller		- - 1082 1082 0 1082 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID float8smaller		- - 1084 1084 0 1084 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID cashsmaller		- -  790  790 0  790 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID datetime_smaller	- - 1184 1184 0 1184 _null_ _null_ ));
+DATA(insert OID = 0 ( min	PGUID timespan_smaller	- - 1186 1186 0 1186 _null_ _null_ ));
 
 DATA(insert OID = 0 ( count PGUID - int4inc - 0 0 23 23 _null_ 0 ));
 
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index ccb7089bea2068b2f2a3fe0209bdad9c69aefbc1..6559332dfba0ba120864f3f92ab83b6d3a5e6e89 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.31 1998/05/09 22:48:35 thomas Exp $
+ * $Id: pg_operator.h,v 1.32 1998/07/08 14:08:59 thomas Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -88,19 +88,26 @@ typedef FormData_pg_operator *OperatorTupleForm;
  * ----------------
  */
 
-DATA(insert OID = 58 (	"<"		   PGUID 0 b t f  16  16  16  85   91  0  0 boollt intltsel intltjoinsel ));
-DATA(insert OID = 59 (	">"		   PGUID 0 b t f  16  16  16  85   91  0  0 boolgt intltsel intltjoinsel ));
-DATA(insert OID = 85 (	"<>"	   PGUID 0 b t f  16  16  16  85   91  0  0 boolne neqsel neqjoinsel ));
-DATA(insert OID = 91 (	"="		   PGUID 0 b t t  16  16  16  91   85  0  0 booleq eqsel eqjoinsel ));
+DATA(insert OID =  15 (	"="		   PGUID 0 b t t  23  20  16 416 417  37  37 int48eq eqsel eqjoinsel ));
+DATA(insert OID =  36 (	"<>"	   PGUID 0 b t t  23  20  16 417 416   0   0 int48ne neqsel neqjoinsel ));
+DATA(insert OID =  37 (	"<"		   PGUID 0 b t f  23  20  16 430 430   0   0 int48lt intltsel intltjoinsel ));
+DATA(insert OID =  76 (	">"		   PGUID 0 b t f  23  20  16 420 420   0   0 int48gt intgtsel intgtjoinsel ));
+DATA(insert OID =  80 (	"<="	   PGUID 0 b t f  23  20  16 419 419   0   0 int48le intlesel intlejoinsel ));
+DATA(insert OID =  82 (	">="	   PGUID 0 b t f  23  20  16 418 418   0   0 int48ge intgesel intgejoinsel ));
+
+DATA(insert OID =  58 (	"<"		   PGUID 0 b t f  16  16  16  85  91   0   0 boollt intltsel intltjoinsel ));
+DATA(insert OID =  59 (	">"		   PGUID 0 b t f  16  16  16  85  91   0   0 boolgt intltsel intltjoinsel ));
+DATA(insert OID =  85 (	"<>"	   PGUID 0 b t f  16  16  16  85  91   0   0 boolne neqsel neqjoinsel ));
+DATA(insert OID =  91 (	"="		   PGUID 0 b t t  16  16  16  91  85   0   0 booleq eqsel eqjoinsel ));
 #define BooleanEqualOperator   91
 
-DATA(insert OID = 92 (	"="		   PGUID 0 b t t  18  18  16  92 630  631 631 chareq eqsel eqjoinsel ));
-DATA(insert OID = 93 (	"="		   PGUID 0 b t t  19  19  16  93  643 660 660 nameeq eqsel eqjoinsel ));
-DATA(insert OID = 94 (	"="		   PGUID 0 b t t  21  21  16  94 519 95 95 int2eq eqsel eqjoinsel ));
-DATA(insert OID = 95 (	"<"		   PGUID 0 b t f  21  21  16 520 524 0 0 int2lt intltsel intltjoinsel ));
-DATA(insert OID = 96 (	"="		   PGUID 0 b t t  23  23  16  96 518 97 97 int4eq eqsel eqjoinsel ));
-DATA(insert OID = 97 (	"<"		   PGUID 0 b t f  23  23  16 521 525 0 0 int4lt intltsel intltjoinsel ));
-DATA(insert OID = 98 (	"="		   PGUID 0 b t t  25  25  16  98 531 664 664 texteq eqsel eqjoinsel ));
+DATA(insert OID =  92 (	"="		   PGUID 0 b t t  18  18  16  92 630 631 631 chareq eqsel eqjoinsel ));
+DATA(insert OID =  93 (	"="		   PGUID 0 b t t  19  19  16  93 643 660 660 nameeq eqsel eqjoinsel ));
+DATA(insert OID =  94 (	"="		   PGUID 0 b t t  21  21  16  94 519  95  95 int2eq eqsel eqjoinsel ));
+DATA(insert OID =  95 (	"<"		   PGUID 0 b t f  21  21  16 520 524   0   0 int2lt intltsel intltjoinsel ));
+DATA(insert OID =  96 (	"="		   PGUID 0 b t t  23  23  16  96 518  97  97 int4eq eqsel eqjoinsel ));
+DATA(insert OID =  97 (	"<"		   PGUID 0 b t f  23  23  16 521 525   0   0 int4lt intltsel intltjoinsel ));
+DATA(insert OID =  98 (	"="		   PGUID 0 b t t  25  25  16  98 531 664 664 texteq eqsel eqjoinsel ));
 
 DATA(insert OID = 329 (  "="	   PGUID 0 b t t  1000	1000  16  329 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 349 (  "="	   PGUID 0 b t t  1001	1001  16  349 0  0	0 array_eq eqsel eqjoinsel ));
@@ -135,6 +142,21 @@ DATA(insert OID = 399 (  "="	   PGUID 0 b t t  1026	1026  16  399 0  0	0 array_e
 DATA(insert OID = 400 (  "="	   PGUID 0 b t t  1027	1027  16  400 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 401 (  "="	   PGUID 0 b t t  1034	1034  16  401 0  0	0 array_eq eqsel eqjoinsel ));
 
+DATA(insert OID = 410 (	"="		   PGUID 0 b t t  20  20  16 410 411 412 412 int8eq eqsel eqjoinsel ));
+DATA(insert OID = 411 (	"<>"	   PGUID 0 b t t  20  20  16 411 410 0 0 int8ne neqsel neqjoinsel ));
+DATA(insert OID = 412 (	"<"		   PGUID 0 b t f  20  20  16 415 415 0 0 int8lt intltsel intltjoinsel ));
+DATA(insert OID = 413 (	">"		   PGUID 0 b t f  20  20  16 414 414 0 0 int8gt intgtsel intgtjoinsel ));
+DATA(insert OID = 414 (	"<="	   PGUID 0 b t f  20  20  16 413 413 0 0 int8le intlesel intlejoinsel ));
+DATA(insert OID = 415 (	">="	   PGUID 0 b t f  20  20  16 412 412 0 0 int8ge intgesel intgejoinsel ));
+
+DATA(insert OID = 416 (	"="		   PGUID 0 b t t  20  23  16  15  36 418 418 int84eq eqsel eqjoinsel ));
+DATA(insert OID = 417 (	"<>"	   PGUID 0 b t t  20  23  16  36  15 0 0 int84ne neqsel neqjoinsel ));
+DATA(insert OID = 418 (	"<"		   PGUID 0 b t f  20  23  16  82  82 0 0 int84lt intltsel intltjoinsel ));
+DATA(insert OID = 419 (	">"		   PGUID 0 b t f  20  23  16  80  80 0 0 int84gt intgtsel intgtjoinsel ));
+DATA(insert OID = 420 (	"<="	   PGUID 0 b t f  20  23  16  76  76 0 0 int84le intlesel intlejoinsel ));
+DATA(insert OID = 430 (	">="	   PGUID 0 b t f  20  23  16  37  37 0 0 int84ge intgesel intgejoinsel ));
+
+DATA(insert OID = 484 (  "-"	   PGUID 0 l t f   0  20  20   0   0   0   0 int8um intltsel intltjoinsel ));
 DATA(insert OID = 485 (  "<<"	   PGUID 0 b t f 604 604  16   0   0   0   0 poly_left intltsel intltjoinsel ));
 DATA(insert OID = 486 (  "&<"	   PGUID 0 b t f 604 604  16   0   0   0   0 poly_overleft intltsel intltjoinsel ));
 DATA(insert OID = 487 (  "&>"	   PGUID 0 b t f 604 604  16   0   0   0   0 poly_overright intltsel intltjoinsel ));
@@ -322,6 +344,19 @@ DATA(insert OID = 679 (  ">="	   PGUID 0 b t f  911  911	16 677 676	0 0 oidnameg
 DATA(insert OID = 680 (  ">"	   PGUID 0 b t f  911  911	16 676 677	0 0 oidnamegt intltsel intltjoinsel ));
 DATA(insert OID = 681 (  "<>"	   PGUID 0 b t f  911  911	16 681 678	0 0 oidnamene intltsel intltjoinsel ));
 
+DATA(insert OID = 684 (  "+"	   PGUID 0 b t f  20  20  20 684   0   0   0 int8pl - - ));
+DATA(insert OID = 685 (  "-"	   PGUID 0 b t f  20  20  20 685   0   0   0 int8mi - - ));
+DATA(insert OID = 686 (  "*"	   PGUID 0 b t f  20  20  20 686   0   0   0 int8mul - - ));
+DATA(insert OID = 687 (  "/"	   PGUID 0 b t f  20  20  20 687   0   0   0 int8div - - ));
+DATA(insert OID = 688 (  "+"	   PGUID 0 b t f  20  23  20 688   0   0   0 int84pl - - ));
+DATA(insert OID = 689 (  "-"	   PGUID 0 b t f  20  23  20 689   0   0   0 int84mi - - ));
+DATA(insert OID = 690 (  "*"	   PGUID 0 b t f  20  23  20 690   0   0   0 int84mul - - ));
+DATA(insert OID = 691 (  "/"	   PGUID 0 b t f  20  23  20 691   0   0   0 int84div - - ));
+DATA(insert OID = 692 (  "+"	   PGUID 0 b t f  23  20  20 692   0   0   0 int48pl - - ));
+DATA(insert OID = 693 (  "-"	   PGUID 0 b t f  23  20  20 693   0   0   0 int48mi - - ));
+DATA(insert OID = 694 (  "*"	   PGUID 0 b t f  23  20  20 694   0   0   0 int48mul - - ));
+DATA(insert OID = 695 (  "/"	   PGUID 0 b t f  23  20  20 695   0   0   0 int48div - - ));
+
 DATA(insert OID = 706 (  "<->"	   PGUID 0 b t f 603 603 701 706   0  0  0 box_distance intltsel intltjoinsel ));
 DATA(insert OID = 707 (  "<->"	   PGUID 0 b t f 602 602 701 707   0  0  0 path_distance intltsel intltjoinsel ));
 DATA(insert OID = 708 (  "<->"	   PGUID 0 b t f 628 628 701 708   0  0  0 line_distance intltsel intltjoinsel ));
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 4a3bcb952a37e5c6366cc5d3d60ed0a4d554a437..103be88c0f79a71c16eb5292ce6a4da642161e5d 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.60 1998/06/13 20:27:10 momjian Exp $
+ * $Id: pg_proc.h,v 1.61 1998/07/08 14:08:59 thomas Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -90,7 +90,7 @@ typedef FormData_pg_proc *Form_pg_proc;
  * ----------------
  */
 
-/* keep the following ordered by OID so that later changes can be made easier*/
+/* keep the following ordered by OID so that later changes can be made easier */
 
 /* OIDS 1 - 99 */
 
@@ -203,8 +203,11 @@ DATA(insert OID = 1258 (  textcat		   PGUID 11 f t f 2 f 25 "25 25" 100 0 1 0	fo
 DESCR("concatenate");
 DATA(insert OID = 1377 (  textoctetlen	   PGUID 11 f t f 1 f 23 "25" 100 0 1 0  foo bar ));
 DESCR("octet length");
+
 DATA(insert OID =  84 (  boolne			   PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100  foo bar ));
 DESCR("not equal");
+DATA(insert OID =  89 (  version		   PGUID 11 f t t 0 f 25 "" 100 0 0 100 foo bar ));
+DESCR("PostgreSQL version string");
 
 DATA(insert OID = 1265 (  rtsel			   PGUID 11 f t f 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
 DESCR("r-tree");
@@ -829,6 +832,55 @@ DESCR("hash");
 DATA(insert OID = 456 (  hashtext		   PGUID 11 f t f 2 f 23 "25 25" 100 0 0 100  foo bar ));
 DESCR("hash");
 
+DATA(insert OID = 460 (  int8in			   PGUID 11 f t f 1 f 20 "0" 100 0 0 100  foo bar ));
+DESCR("(internal)");
+DATA(insert OID = 461 (  int8out		   PGUID 11 f t f 1 f 19 "0" 100 0 0 100  foo bar ));
+DESCR("(internal)");
+DATA(insert OID = 462 (  int8um			   PGUID 11 f t f 1 f 20 "20" 100 0 0 100  foo bar ));
+DESCR("unary minus");
+DATA(insert OID = 463 (  int8pl			   PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DESCR("addition");
+DATA(insert OID = 464 (  int8mi			   PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DESCR("subtraction");
+DATA(insert OID = 465 (  int8mul		   PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DESCR("multiply");
+DATA(insert OID = 466 (  int8div		   PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DESCR("divide");
+DATA(insert OID = 467 (  int8eq			   PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DESCR("equal");
+DATA(insert OID = 468 (  int8ne			   PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DESCR("not equal");
+DATA(insert OID = 469 (  int8lt			   PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DESCR("less-than");
+DATA(insert OID = 470 (  int8gt			   PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DESCR("greater-than");
+DATA(insert OID = 471 (  int8le			   PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DESCR("less-than-or-equals");
+DATA(insert OID = 472 (  int8ge			   PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DESCR("greater-than-or-equals");
+
+DATA(insert OID = 474 (  int84eq		   PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DESCR("equal");
+DATA(insert OID = 475 (  int84ne		   PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DESCR("not equal");
+DATA(insert OID = 476 (  int84lt		   PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DESCR("less-than");
+DATA(insert OID = 477 (  int84gt		   PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DESCR("greater-than");
+DATA(insert OID = 478 (  int84le		   PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DESCR("less-than-or-equals");
+DATA(insert OID = 479 (  int84ge		   PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DESCR("greater-than-or-equals");
+
+DATA(insert OID = 480 (  int84			   PGUID 11 f t f 1 f  23 "20" 100 0 0 100  foo bar ));
+DESCR("convert int8 to int4");
+DATA(insert OID = 481 (  int48			   PGUID 11 f t f 1 f  20 "23" 100 0 0 100  foo bar ));
+DESCR("convert int4 to int8");
+DATA(insert OID = 482 (  i8tod			   PGUID 11 f t f 1 f 701 "20" 100 0 0 100  foo bar ));
+DESCR("convert int8 to float8");
+DATA(insert OID = 483 (  dtoi8			   PGUID 11 f t f 1 f  20 "701" 100 0 0 100  foo bar ));
+DESCR("convert float8 to int8");
+
 /* OIDS 500 - 599 */
 
 /* OIDS 600 - 699 */
@@ -861,8 +913,6 @@ DATA(insert OID = 683 (  oid8eq			   PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100
 DESCR("equals");
 
 /* OIDS 700 - 799 */
-
-
 DATA(insert OID = 710 (  getpgusername	   PGUID 11 f t f 0 f 19 "0" 100 0 0 100  foo bar ));
 DESCR("(internal)");
 DATA(insert OID = 711 (  userfntest		   PGUID 11 f t f 1 f 23 "23" 100 0 0 100  foo bar ));
@@ -951,13 +1001,13 @@ DESCR("");
 DATA(insert OID = 767 (  int2inc		   PGUID 11 f t f 1 f 21 "21" 100 0 0 100  foo bar ));
 DESCR("");
 DATA(insert OID = 768 (  int4larger		   PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
-DESCR("");
+DESCR("larger of two");
 DATA(insert OID = 769 (  int4smaller	   PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
-DESCR("");
+DESCR("smaller of two");
 DATA(insert OID = 770 (  int2larger		   PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
-DESCR("");
+DESCR("larger of two");
 DATA(insert OID = 771 (  int2smaller	   PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
-DESCR("");
+DESCR("smaller of two");
 DATA(insert OID = 772 (  gistsel		   PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
 DESCR("gist selectivity");
 DATA(insert OID = 773 (  gistnpage		   PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
@@ -1035,13 +1085,31 @@ DESCR("matches LIKE expression");
 DATA(insert OID =  859 (  namenlike		   PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  foo bar ));
 DESCR("does not match LIKE expression");
 
-DATA(insert OID =  846 (  cash_mul_flt4		   PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100  foo bar ));
+DATA(insert OID =  846 (  cash_mul_flt4	   PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100  foo bar ));
 DESCR("multiply");
-DATA(insert OID =  847 (  cash_div_flt4		   PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100  foo bar ));
+DATA(insert OID =  847 (  cash_div_flt4	   PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100  foo bar ));
 DESCR("divide");
-DATA(insert OID =  848 (  flt4_mul_cash		   PGUID 11 f t f 2 f 790 "700 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  848 (  flt4_mul_cash    PGUID 11 f t f 2 f 790 "700 790" 100 0 0 100  foo bar ));
 DESCR("multiply");
 
+DATA(insert OID =  852 (  int48eq		   PGUID 11 f t f 2 f 16 "21 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 ));
+DESCR("not equal");
+DATA(insert OID =  854 (  int48lt		   PGUID 11 f t f 2 f 16 "21 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 ));
+DESCR("greater-than");
+DATA(insert OID =  856 (  int48le		   PGUID 11 f t f 2 f 16 "21 20" 100 0 0 100  foo bar ));
+DESCR("less-than-or-equals");
+DATA(insert OID =  857 (  int48ge		   PGUID 11 f t f 2 f 16 "21 20" 100 0 0 100  foo bar ));
+DESCR("greater-than-or-equals");
+
+DATA(insert OID =  860 (  char_bpchar      PGUID 11 f t f 1 f 1042 "18" 100 0 0 100  foo bar ));
+DESCR("convert to bpchar");
+DATA(insert OID =  861 (  bpchar_char      PGUID 11 f t f 1 f   18 "1042" 100 0 0 100  foo bar ));
+DESCR("convert to char");
+
 DATA(insert OID =  862 (  int4_mul_cash		   PGUID 11 f t f 2 f 790 "23 790" 100 0 0 100	foo bar ));
 DESCR("multiply");
 DATA(insert OID =  863 (  int2_mul_cash		   PGUID 11 f t f 2 f 790 "21 790" 100 0 0 100	foo bar ));
@@ -1448,6 +1516,16 @@ DESCR("truncate datetime to specified units");
 DATA(insert OID = 1218 (  timespan_trunc   PGUID 11 f t f 2 f 1186 "25 1186" 100 0 0 100  foo bar ));
 DESCR("truncate timespan to specified units");
 
+DATA(insert OID = 1230 (  bpchar           PGUID 14 f t f 1 f 1042 "18" 100 0 0 100  "select char_bpchar($1)" - ));
+DESCR("convert to bpchar");
+DATA(insert OID = 1231 (  char             PGUID 14 f t f 1 f   23 "1042" 100 0 0 100  "select bpchar_char($1)" - ));
+DESCR("convert to char");
+
+DATA(insert OID = 1236 (  int8larger	   PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DESCR("larger of two");
+DATA(insert OID = 1237 (  int8smaller	   PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DESCR("smaller of two");
+
 DATA(insert OID = 1238 (  texticregexeq    PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0	foo bar ));
 DESCR("matches regex., case-insensitive");
 DATA(insert OID = 1239 (  texticregexne    PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0	foo bar ));
@@ -1471,6 +1549,23 @@ DESCR("convert");
 DATA(insert OID = 1271 (  timespan_finite  PGUID 11 f t f 1 f	16 "1186" 100 0 0 100  foo bar ));
 DESCR("boolean test");
 
+DATA(insert OID = 1274 (  int84pl		   PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  foo bar ));
+DESCR("addition");
+DATA(insert OID = 1275 (  int84mi		   PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  foo bar ));
+DESCR("subtraction");
+DATA(insert OID = 1276 (  int84mul		   PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  foo bar ));
+DESCR("multiply");
+DATA(insert OID = 1277 (  int84div		   PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  foo bar ));
+DESCR("divide");
+DATA(insert OID = 1278 (  int48pl		   PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  foo bar ));
+DESCR("addition");
+DATA(insert OID = 1279 (  int48mi		   PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  foo bar ));
+DESCR("subtraction");
+DATA(insert OID = 1280 (  int48mul		   PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  foo bar ));
+DESCR("multiply");
+DATA(insert OID = 1281 (  int48div		   PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  foo bar ));
+DESCR("divide");
+
 DATA(insert OID = 1297 (  timestamp_in	   PGUID 11 f t f 1 f 1296 "0" 100 0 0 100	foo bar ));
 DESCR("(internal)");
 DATA(insert OID = 1298 (  timestamp_out    PGUID 11 f t f 1 f	23 "0" 100 0 0 100	foo bar ));
@@ -1582,11 +1677,6 @@ DESCR("octet length");
 DATA(insert OID = 1376 (  octet_length			 PGUID 14 f t f 1 f   23   "1043" 100 0 0 100  "select varcharoctetlen($1)" - ));
 DESCR("octet length");
 
-DATA(insert OID = 1374 (  char_bpchar		 PGUID 11 f t f 1 f 1042 "18" 100 0 0 100  foo bar ));
-DATA(insert OID = 1375 (  bpchar			 PGUID 14 f t f 1 f 1042 "18" 100 0 0 100  "select char_bpchar($1)" - ));
-DATA(insert OID = 1376 (  bpchar_char		 PGUID 11 f t f 1 f   18 "1042" 100 0 0 100  foo bar ));
-DATA(insert OID = 1377 (  char				 PGUID 14 f t f 1 f   23 "1042" 100 0 0 100  "select bpchar_char($1)" - ));
-
 DATA(insert OID = 1380 (  date_part    PGUID 14 f t f 2 f  701 "25 1184" 100 0 0 100  "select datetime_part($1, $2)" - ));
 DESCR("extract field from datetime");
 DATA(insert OID = 1381 (  date_part    PGUID 14 f t f 2 f  701 "25 1186" 100 0 0 100  "select timespan_part($1, $2)" - ));
@@ -1645,7 +1735,6 @@ DATA(insert OID = 1404 (  int		   PGUID 14 f t f 1 f	23	 "23" 100 0 0 100  "sele
 DESCR("convert int4 to int4 (no-op)");
 DATA(insert OID = 1405 (  int2		   PGUID 14 f t f 1 f	21	 "21" 100 0 0 100  "select $1" - ));
 DESCR("convert int2 to int2 (no-op)");
-
 DATA(insert OID = 1406 (  float8	   PGUID 14 f t f 1 f  701	"701" 100 0 0 100  "select $1" - ));
 DESCR("convert float8 to float8 (no-op)");
 DATA(insert OID = 1407 (  float8	   PGUID 14 f t f 1 f  701	"700" 100 0 0 100  "select ftod($1)" - ));
@@ -1666,8 +1755,6 @@ DATA(insert OID = 1414 (  int4		   PGUID 14 f t f 1 f	23	 "21" 100 0 0 100  "sel
 DESCR("convert int2 to int4");
 DATA(insert OID = 1415 (  int4		   PGUID 14 f t f 1 f	23	"700" 100 0 0 100  "select ftoi4($1)" - ));
 DESCR("convert float4 to int4");
-DATA(insert OID = 1416 (  int2		   PGUID 14 f t f 1 f	21	 "21" 100 0 0 100  "select $1" - ));
-DESCR("convert int2 to int2 (no-op)");
 DATA(insert OID = 1417 (  int2		   PGUID 14 f t f 1 f	21	 "23" 100 0 0 100  "select i4toi2($1)" - ));
 DESCR("convert int4 to int2");
 DATA(insert OID = 1418 (  int2		   PGUID 14 f t f 1 f	21	"701" 100 0 0 100  "select dtoi2($1)" - ));
@@ -1929,6 +2016,17 @@ DESCR("");
 DATA(insert OID = 1584 (  area				PGUID 14 f t f 1 f 701 "718" 100 0 0 100  "select circle_area($1)" - ));
 DESCR("");
 
+DATA(insert OID = 1592 (  int8				PGUID 14 f t f 1 f  20 "20" 100 0 0 100  "select $1" - ));
+DESCR("convert int8 to int8 (no-op)");
+DATA(insert OID = 1593 (  int8				PGUID 14 f t f 1 f  20 "23" 100 0 0 100  "select int48($1)" - ));
+DESCR("convert int4 to int8");
+DATA(insert OID = 1594 (  int8				PGUID 14 f t f 1 f  20 "701" 100 0 0 100  "select dtoi8($1)" - ));
+DESCR("convert float8 to int8");
+DATA(insert OID = 1595 (  int4				PGUID 14 f t f 1 f  23 "20" 100 0 0 100  "select int84($1)" - ));
+DESCR("convert int8 to int4");
+DATA(insert OID = 1596 (  float8			PGUID 14 f t f 1 f 701 "20" 100 0 0 100  "select i8tod($1)" - ));
+DESCR("convert int8 to float8");
+
 /* OIDS 1600 - 1699 */
 
 DATA(insert OID = 1600 (  line				PGUID 14 f t f 2 f 628 "600 600" 100 0 0 100  "select line_construct_pp($1, $2)" - ));
@@ -1985,9 +2083,6 @@ DESCR("sequence next value");
 DATA(insert OID =  1319 (  currval	   PGUID 11 f t f 1 f 23 "25" 100 0 0 100  foo bar ));
 DESCR("sequence current value");
 
-DATA(insert OID = 1600 ( version       PGUID 11 f t t 0 f 25 "" 100 0 0 100 foo bar ));
-DESCR("PostgreSQL version string");
-
 
 /*
  * prototypes for functions pg_proc.c
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 7130ba2a9ef77f57e894e6a7091aabe9f6c83830..fd2418cf7dc5335313ebac3d4484a13120f75bc0 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.40 1998/05/09 22:48:37 thomas Exp $
+ * $Id: pg_type.h,v 1.41 1998/07/08 14:09:00 thomas Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -67,8 +67,8 @@ CATALOG(pg_type) BOOTSTRAP
 	 * the I/O routines are written to expect pass by reference. Note that
 	 * float4 is written for pass by reference and has a declared length
 	 * of 4 bytes, so it looks like pass by reference must be consistant
-	 * with the declared length, and typbyval is used somewhere. - tgl
-	 * 97/03/20)
+	 * with the declared length, and typbyval is used somewhere.
+	 * - tgl 1997-03-20).
 	 */
 	char		typtype;
 	bool		typisdefined;
@@ -160,11 +160,15 @@ DESCR("variable length array of bytes");
 
 DATA(insert OID = 18 (	char	   PGUID  1   1 t b t \054 0   0 charin charout charin charout c _null_ ));
 DESCR("single character");
-#define CHAROID 18
+#define CHAROID			18
 
 DATA(insert OID = 19 (	name	   PGUID NAMEDATALEN NAMEDATALEN  f b t \054 0	18 namein nameout namein nameout d _null_ ));
 DESCR("31-character type for storing system identifiers");
-#define NAMEOID 19
+#define NAMEOID			19
+
+DATA(insert OID = 20 (  int8	   PGUID  8  20 f b t \054 0   0 int8in int8out int8in int8out d _null_ ));
+DESCR("eight-byte integer, >18 digits");
+#define INT8OID			20
 
 DATA(insert OID = 21 (	int2	   PGUID  2   5 t b t \054 0   0 int2in int2out int2in int2out s _null_ ));
 DESCR("two-byte integer, -32k to 32k");
@@ -189,7 +193,7 @@ DATA(insert OID = 24 (	regproc    PGUID  4  16 t b t \054 0   0 regprocin regpro
 DESCR("registered procedure");
 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
+#define TEXTOID			25
 
 DATA(insert OID = 26 (	oid		   PGUID  4  10 t b t \054 0   0 int4in int4out int4in int4out i _null_ ));
 DESCR("object identifier type");