diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 4e421a5806a59784f5133ef89708b25d623d7e53..ba2b8d3b8982acf384e935c745b42567f4301f7a 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.180 2000/07/28 14:47:23 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.181 2000/07/30 22:13:50 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -2360,14 +2360,18 @@ index_elem:  attr_name opt_class
 opt_class:  class
 				{
 					/*
-					 * Release 7.0 removed network_ops, timespan_ops, and datetime_ops, 
-					 * so we suppress it from being passed to the backend so the default 
-					 * *_ops is used.  This can be removed in some later release.  
-					 * bjm 2000/02/07 
+					 * Release 7.0 removed network_ops, timespan_ops, and
+					 * datetime_ops, so we suppress it from being passed to
+					 * the parser so the default *_ops is used.  This can be
+					 * removed in some later release.  bjm 2000/02/07
+					 *
+					 * Release 7.1 removes lztext_ops, so suppress that too
+					 * for a while.  tgl 2000/07/30
 					 */
 					if (strcmp($1, "network_ops") != 0 &&
 						strcmp($1, "timespan_ops") != 0 &&
-						strcmp($1, "datetime_ops") != 0)
+						strcmp($1, "datetime_ops") != 0 &&
+						strcmp($1, "lztext_ops") != 0)
 						$$ = $1;
 					else
 						$$ = NULL;
@@ -5884,6 +5888,10 @@ xlateSqlFunc(char *name)
  *
  * Convert "datetime" and "timespan" to allow a transition to SQL92 type names.
  * Remove this translation for v7.1 - thomas 2000-03-25
+ *
+ * Convert "lztext" to "text" to allow forward compatibility for anyone using
+ * the undocumented "lztext" type in 7.0.  This can go away in 7.2 or later
+ * - tgl 2000-07-30
  */
 static char *
 xlateSqlType(char *name)
@@ -5905,6 +5913,8 @@ xlateSqlType(char *name)
 		return "timestamp";
 	else if (strcmp(name, "timespan") == 0)
 		return "interval";
+	else if (strcmp(name, "lztext") == 0)
+		return "text";
 	else if (strcmp(name, "boolean") == 0)
 		return "bool";
 	else
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 104a0cb926c29c9bb31adedd3c59bd895ae3f1f9..bd098fb6c68294d613b3ee733ef28dae6dfde658 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.45 2000/07/05 23:11:32 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.46 2000/07/30 22:13:50 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -333,7 +333,6 @@ TypeCategory(Oid inType)
 		case (BPCHAROID):
 		case (VARCHAROID):
 		case (TEXTOID):
-		case (LZTEXTOID):
 			result = STRING_TYPE;
 			break;
 
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index d92190f652419a060afddf75c95b09a14a39841c..5f9907080b374c941b1a324b6efbbce212087002 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.48 2000/06/30 07:04:22 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.49 2000/07/30 22:13:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -65,8 +65,8 @@ InsertRule(char *rulname,
 	values[i++] = ObjectIdGetDatum(eventrel_oid);
 	values[i++] = Int16GetDatum(evslot_index);
 	values[i++] = BoolGetDatum(evinstead);
-	values[i++] = PointerGetDatum(lztextin(evqual));
-	values[i++] = PointerGetDatum(lztextin(actiontree));
+	values[i++] = DirectFunctionCall1(textin, CStringGetDatum(evqual));
+	values[i++] = DirectFunctionCall1(textin, CStringGetDatum(actiontree));
 
 	/* ----------------
 	 *	create a new pg_rewrite tuple
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 0f42d93aadbde2c50896d5c5abb0fd8729ee21a0..00917cac8f8490d29f66870edf7ebb31f0cca1f4 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for utils/adt
 #
-# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.40 2000/07/22 03:34:43 tgl Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.41 2000/07/30 22:13:52 tgl Exp $
 #
 
 subdir = src/backend/utils/adt
@@ -16,8 +16,8 @@ endif
 endif
 
 OBJS = acl.o arrayfuncs.o arrayutils.o bool.o cash.o char.o \
-	date.o datetime.o datum.o filename.o float.o format_type.o \
-	geo_ops.o geo_selfuncs.o int.o int8.o like.o lztext.o \
+	date.o datetime.o datum.o float.o format_type.o \
+	geo_ops.o geo_selfuncs.o int.o int8.o like.o \
 	misc.o nabstime.o name.o not_in.o numeric.o numutils.o \
 	oid.o oracle_compat.o \
 	regexp.o regproc.o ruleutils.o selfuncs.o sets.o \
diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c
deleted file mode 100644
index 60034d5fd2ed7a0874f187b739aec8d3cce2e820..0000000000000000000000000000000000000000
--- a/src/backend/utils/adt/filename.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * filename.c
- *
- *
- * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.24 2000/01/26 05:57:14 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-
-#include <pwd.h>
-
-#include <sys/param.h>
-
-#include "postgres.h"
-#include "miscadmin.h"
-#include "utils/builtins.h"
-
-char *
-filename_in(char *file)
-{
-	char	   *str;
-	int			ind = 0;
-
-	/*
-	 * XXX - HACK CITY --- REDO should let the shell do expansions
-	 * (shexpand)
-	 */
-
-	str = (char *) palloc(MAXPGPATH);
-	str[0] = '\0';
-	if (file[0] == '~')
-	{
-		if (file[1] == '\0' || file[1] == '/')
-		{
-			/* Home directory */
-
-			char	   *userName;
-			struct passwd *pw;
-
-			userName = GetPgUserName();
-
-			if ((pw = getpwnam(userName)) == NULL)
-			{
-				elog(ERROR, "User %s is not a Unix user on the db server.",
-					 userName);
-			}
-
-			strcpy(str, pw->pw_dir);
-
-			ind = 1;
-		}
-		else
-		{
-			/* Someone else's directory */
-			char		name[17],
-					   *p;
-			struct passwd *pw;
-			int			len;
-
-			if ((p = (char *) strchr(file, '/')) == NULL)
-			{
-				strcpy(name, file + 1);
-				len = strlen(name);
-			}
-			else
-			{
-				len = (p - file) - 1;
-				StrNCpy(name, file + 1, len + 1);
-			}
-			/* printf("name: %s\n"); */
-			if ((pw = getpwnam(name)) == NULL)
-			{
-				elog(ERROR, "No such user: %s\n", name);
-				ind = 0;
-			}
-			else
-			{
-				strcpy(str, pw->pw_dir);
-				ind = len + 1;
-			}
-		}
-	}
-	else if (file[0] == '$')
-	{							/* $POSTGRESHOME, etc.	expand it. */
-		char		environment[80],
-				   *envirp,
-				   *p;
-		int			len;
-
-		if ((p = (char *) strchr(file, '/')) == NULL)
-		{
-			strcpy(environment, file + 1);
-			len = strlen(environment);
-		}
-		else
-		{
-			len = (p - file) - 1;
-			StrNCpy(environment, file + 1, len + 1);
-		}
-		envirp = getenv(environment);
-		if (envirp)
-		{
-			strcpy(str, envirp);
-			ind = len + 1;
-		}
-		else
-			elog(ERROR, "Couldn't find %s in your environment", environment);
-	}
-	else
-		ind = 0;
-	strcat(str, file + ind);
-	return str;
-}
-
-char *
-filename_out(char *s)
-{
-	char	   *ret;
-
-	if (!s)
-		return (char *) NULL;
-	ret = (char *) palloc(strlen(s) + 1);
-	if (!ret)
-		elog(ERROR, "filename_out: palloc failed");
-	return strcpy(ret, s);
-}
diff --git a/src/backend/utils/adt/lztext.c b/src/backend/utils/adt/lztext.c
deleted file mode 100644
index e1f80f63dacdbebcc055b9e9d51d32a0b3972529..0000000000000000000000000000000000000000
--- a/src/backend/utils/adt/lztext.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/* ----------
- * lztext.c -
- *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/lztext.c,v 1.10 2000/07/06 05:48:11 tgl Exp $
- *
- *	Text type with internal LZ compressed representation. Uses the
- *	standard PostgreSQL compression method.
- *
- *	This code requires that the LZ compressor found in pg_lzcompress
- *	codes a usable VARSIZE word at the beginning of the output buffer.
- * ----------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <errno.h>
-
-#include "postgres.h"
-#include "utils/builtins.h"
-#ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
-#endif
-
-/* ----------
- * lztextin -
- *
- *		Input function for datatype lztext
- * ----------
- */
-lztext *
-lztextin(char *str)
-{
-	lztext	   *result;
-	int32		rawsize;
-
-	/* ----------
-	 * Handle NULL
-	 * ----------
-	 */
-	if (str == NULL)
-		return NULL;
-
-	rawsize = strlen(str);
-	result  = (lztext *)palloc(VARHDRSZ + rawsize);
-
-	VARATT_SIZEP(result) = VARHDRSZ + rawsize;
-	memcpy(VARATT_DATA(result), str, rawsize);
-
-	return result;
-}
-
-
-/* ----------
- * lztextout -
- *
- *		Output function for data type lztext
- * ----------
- */
-char *
-lztextout(lztext *lz)
-{
-	char	   *result;
-	void	   *tmp;
-	int32		rawsize;
-
-	/* ----------
-	 * Handle NULL
-	 * ----------
-	 */
-	if (lz == NULL)
-	{
-		result = (char *) palloc(2);
-		result[0] = '-';
-		result[1] = '\0';
-		return result;
-	}
-
-	VARATT_GETPLAIN(lz, tmp);
-
-	rawsize = VARATT_SIZE(tmp) - VARHDRSZ;
-	result  = (char *)palloc(rawsize + 1);
-	memcpy(result, VARATT_DATA(tmp), rawsize);
-	result[rawsize] = '\0';
-
-	VARATT_FREE(lz, tmp);
-
-	return result;
-}
-
-
-/* ----------
- * lztextlen -
- *
- *	Logical length of lztext field (it's the uncompressed size
- *	of the original data).
- * ----------
- */
-int32
-lztextlen(lztext *lz)
-{
-#ifdef MULTIBYTE
-	unsigned char *s1,
-			   *s2;
-	int			len;
-	int			l;
-	int			wl;
-
-#endif
-	/* ----------
-	 * Handle NULL
-	 * ----------
-	 */
-	if (lz == NULL)
-		return 0;
-
-#ifdef MULTIBYTE
-	len = 0;
-	s1 = s2 = (unsigned char *) lztextout(lz);
-	l = strlen(s2);
-	while (l > 0)
-	{
-		wl = pg_mblen(s1);
-		l -= wl;
-		s1 += wl;
-		len++;
-	}
-	pfree((char *) s2);
-	return (len);
-#else
-	/* ----------
-	 * without multibyte support, it's the remembered rawsize
-	 * ----------
-	 */
-	if (!VARATT_IS_EXTENDED(lz))
-	    return VARATT_SIZE(lz) - VARHDRSZ;
-
-    if (VARATT_IS_EXTERNAL(lz))
-	    return lz->va_content.va_external.va_rawsize;
-
-	return lz->va_content.va_compressed.va_rawsize;
-#endif
-}
-
-
-/* ----------
- * lztextoctetlen -
- *
- *	Physical length of lztext field (it's the compressed size
- *	plus the rawsize field).
- * ----------
- */
-int32
-lztextoctetlen(lztext *lz)
-{
-	/* ----------
-	 * Handle NULL
-	 * ----------
-	 */
-	if (lz == NULL)
-		return 0;
-
-	if (!VARATT_IS_EXTERNAL(lz))
-	    return VARATT_SIZE(lz) - VARHDRSZ;
-
-	return lz->va_content.va_external.va_extsize;
-}
-
-
-/* ----------
- * text_lztext -
- *
- *	Convert text to lztext
- * ----------
- */
-Datum
-text_lztext(PG_FUNCTION_ARGS)
-{
-	text	   *txt = PG_GETARG_TEXT_P(0);
-	lztext	   *result;
-	int32		rawsize;
-
-	/* ----------
-	 * Copy the entire attribute
-	 * ----------
-	 */
-	rawsize = VARSIZE(txt) - VARHDRSZ;
-	result  = (lztext *)palloc(rawsize + VARHDRSZ);
-	VARATT_SIZEP(result) = rawsize + VARHDRSZ;
-	memcpy(VARATT_DATA(result), VARATT_DATA(txt), rawsize);
-
-	PG_RETURN_POINTER(result);
-}
-
-
-/* ----------
- * lztext_text -
- *
- *	Convert lztext to text
- * ----------
- */
-text *
-lztext_text(lztext *lz)
-{
-	text	   *result;
-	lztext	   *tmp;
-	int32		rawsize;
-
-	/* ----------
-	 * Handle NULL
-	 * ----------
-	 */
-	if (lz == NULL)
-		return NULL;
-
-	VARATT_GETPLAIN(lz, tmp);
-	
-	rawsize = VARATT_SIZE(tmp) - VARHDRSZ;
-	result  = (text *)palloc(rawsize + VARHDRSZ);
-	VARATT_SIZEP(result) = rawsize + VARHDRSZ;
-	memcpy(VARATT_DATA(result), VARATT_DATA(tmp), rawsize);
-
-	VARATT_FREE(lz, tmp);
-
-	return result;
-}
-
-
-/* ----------
- * lztext_cmp -
- *
- *		Comparision function for two lztext datum's.
- *
- *		Returns -1, 0 or 1.
- * ----------
- */
-int32
-lztext_cmp(lztext *lz1, lztext *lz2)
-{
-#ifdef USE_LOCALE
-
-	char	   *cp1;
-	char	   *cp2;
-	int			result;
-
-	if (lz1 == NULL || lz2 == NULL)
-		return (int32) 0;
-
-	cp1 = lztextout(lz1);
-	cp2 = lztextout(lz2);
-
-	result = strcoll(cp1, cp2);
-
-	pfree(cp1);
-	pfree(cp2);
-
-	return result;
-
-#else							/* !USE_LOCALE */
-
-	int		result;
-	char   *p1 = NULL;
-	char   *p2 = NULL;
-	int		size1;
-	int		size2;
-
-	if (lz1 == NULL || lz2 == NULL)
-		return 0;
-
-	VARATT_GETPLAIN(lz1, p1);
-	VARATT_GETPLAIN(lz2, p2);
-
-    size1 = VARATT_SIZE(p1) - VARHDRSZ;
-    size2 = VARATT_SIZE(p2) - VARHDRSZ;
-    result = memcmp(VARATT_DATA(p1), VARATT_DATA(p2),
-                (size1 < size2) ? size1 : size2);
-    if (result == 0)
-    {
-        if (size1 > size2)
-            result = 1;
-        else if (size1 < size2)
-            result = -1;
-    }
-
-    VARATT_FREE(lz2, p2);
-    VARATT_FREE(lz1, p1);
-
-	return result;
-
-#endif	 /* USE_LOCALE */
-}
-
-
-/* ----------
- * lztext_eq ... -
- *
- *		=, !=, >, >=, < and <= operator functions for two
- *		lztext datums.
- * ----------
- */
-bool
-lztext_eq(lztext *lz1, lztext *lz2)
-{
-	if (lz1 == NULL || lz2 == NULL)
-		return false;
-
-	return (bool) (lztext_cmp(lz1, lz2) == 0);
-}
-
-
-bool
-lztext_ne(lztext *lz1, lztext *lz2)
-{
-	if (lz1 == NULL || lz2 == NULL)
-		return false;
-
-	return (bool) (lztext_cmp(lz1, lz2) != 0);
-}
-
-
-bool
-lztext_gt(lztext *lz1, lztext *lz2)
-{
-	if (lz1 == NULL || lz2 == NULL)
-		return false;
-
-	return (bool) (lztext_cmp(lz1, lz2) > 0);
-}
-
-
-bool
-lztext_ge(lztext *lz1, lztext *lz2)
-{
-	if (lz1 == NULL || lz2 == NULL)
-		return false;
-
-	return (bool) (lztext_cmp(lz1, lz2) >= 0);
-}
-
-
-bool
-lztext_lt(lztext *lz1, lztext *lz2)
-{
-	if (lz1 == NULL || lz2 == NULL)
-		return false;
-
-	return (bool) (lztext_cmp(lz1, lz2) < 0);
-}
-
-
-bool
-lztext_le(lztext *lz1, lztext *lz2)
-{
-	if (lz1 == NULL || lz2 == NULL)
-		return false;
-
-	return (bool) (lztext_cmp(lz1, lz2) <= 0);
-}
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index a7cb0ecac4998bfce06754fcfdffb318c20157ed..84f20757d6a237a3eac36f70d660622176945ed5 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.107 2000/07/14 22:17:50 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.108 2000/07/30 22:13:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -775,7 +775,9 @@ RelationBuildRuleLock(Relation relation)
 								  Anum_pg_rewrite_ev_action,
 								  pg_rewrite_tupdesc,
 								  &isnull);
-		ruleaction_str = lztextout((lztext *) DatumGetPointer(ruleaction));
+		Assert(! isnull);
+		ruleaction_str = DatumGetCString(DirectFunctionCall1(textout,
+															 ruleaction));
 		oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
 		rule->actions = (List *) stringToNode(ruleaction_str);
 		MemoryContextSwitchTo(oldcxt);
@@ -785,7 +787,9 @@ RelationBuildRuleLock(Relation relation)
 								   Anum_pg_rewrite_ev_qual,
 								   pg_rewrite_tupdesc,
 								   &isnull);
-		rule_evqual_str = lztextout((lztext *) DatumGetPointer(rule_evqual));
+		Assert(! isnull);
+		rule_evqual_str = DatumGetCString(DirectFunctionCall1(textout,
+															  rule_evqual));
 		oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
 		rule->qual = (Node *) stringToNode(rule_evqual_str);
 		MemoryContextSwitchTo(oldcxt);
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 80be91a70f48d87d4ed70426e4089fc4f93aa7f7..0a8b0d43ccef8e57b9c724c5b4a233f87f04b74a 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catversion.h,v 1.37 2000/07/17 03:05:23 tgl Exp $
+ * $Id: catversion.h,v 1.38 2000/07/30 22:13:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200007161
+#define CATALOG_VERSION_NO	200007301
 
 #endif
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index ff79f1d533e29c0c4f6d164b6b14c59396ac8085..9176820bc07c338e82398c303f2783ea0b3539a8 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_amop.h,v 1.34 2000/06/19 03:54:45 tgl Exp $
+ * $Id: pg_amop.h,v 1.35 2000/07/30 22:13:59 tgl Exp $
  *
  * NOTES
  *	 the genbki.sh script reads this file and generates .bki
@@ -350,16 +350,6 @@ DATA(insert OID = 0 (  403 1690   91 3 ));
 DATA(insert OID = 0 (  403 1690 1695 4 ));
 DATA(insert OID = 0 (  403 1690   59 5 ));
 
-/*
- *	  nbtree lztext
- */
-
-DATA(insert OID = 0 (  403 1663 1659 1 ));
-DATA(insert OID = 0 (  403 1663 1660 2 ));
-DATA(insert OID = 0 (  403 1663 1657 3 ));
-DATA(insert OID = 0 (  403 1663 1662 4 ));
-DATA(insert OID = 0 (  403 1663 1661 5 ));
-
 
 /*
  *	hash table _ops
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index fda508e6023da48756e6bd732a1387adc1834baf..7b03f3c9b2a40bbebc9e8d0a3301f52fa617af27 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_amproc.h,v 1.23 2000/06/19 03:54:45 tgl Exp $
+ * $Id: pg_amproc.h,v 1.24 2000/07/30 22:13:59 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -98,7 +98,6 @@ DATA(insert OID = 0 (403  935  926 1));
 DATA(insert OID = 0 (403  652  926 1));
 DATA(insert OID = 0 (403 1768 1769 1));
 DATA(insert OID = 0 (403 1690 1693 1));
-DATA(insert OID = 0 (403 1663 1636 1));
 DATA(insert OID = 0 (403 1399 1358 1));
 
 
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index d75bdcb52c48a52551c5e0b8893e4d5c132f6dc8..277301d77d21cd1c6b05208a15f4ea373bd1e82f 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_opclass.h,v 1.34 2000/07/04 06:11:54 tgl Exp $
+ * $Id: pg_opclass.h,v 1.35 2000/07/30 22:13:59 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -115,8 +115,6 @@ DATA(insert OID = 652  (	cidr_ops		650   ));
 DESCR("");
 DATA(insert OID = 1768 (	numeric_ops    1700   ));
 DESCR("");
-DATA(insert OID = 1663 (	lztext_ops	   1625   ));
-DESCR("");
 DATA(insert OID = 1690 (	bool_ops		 16   ));
 DESCR("");
 DATA(insert OID = 1399 (	timetz_ops	   1266   ));
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index e8881bf037a9c25014790aaa54f79a7bcb75672f..a63b789989c1b97f074aed710d7307f933e5b627 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_operator.h,v 1.78 2000/07/28 05:07:42 tgl Exp $
+ * $Id: pg_operator.h,v 1.79 2000/07/30 22:13:59 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -135,7 +135,6 @@ DATA(insert OID = 395 (  "="	   PGUID 0 b t f  1022	1022  16  395 0  0	0 array_e
 DATA(insert OID = 396 (  "="	   PGUID 0 b t f  1023	1023  16  396 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 397 (  "="	   PGUID 0 b t f  1024	1024  16  397 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 398 (  "="	   PGUID 0 b t f  1025	1025  16  398 0  0	0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 399 (  "="	   PGUID 0 b t f  1026	1026  16  399 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 400 (  "="	   PGUID 0 b t f  1027	1027  16  400 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 401 (  "="	   PGUID 0 b t f  1034	1034  16  401 0  0	0 array_eq eqsel eqjoinsel ));
 
@@ -708,14 +707,6 @@ DATA(insert OID = 1761 (  "/"	   PGUID 0 b t f 1700 1700 1700    0	0 0 0 numeric
 DATA(insert OID = 1762 (  "%"	   PGUID 0 b t f 1700 1700 1700    0	0 0 0 numeric_mod - - ));
 DATA(insert OID = 1763 (  "@"	   PGUID 0 l t f	0 1700 1700    0	0 0 0 numeric_abs - - ));
 
-/* LZTEXT type */
-DATA(insert OID = 1657 (  "="	 PGUID 0 b t f 1625 1625   16 1657 1658 1659 1659 lztext_eq eqsel eqjoinsel ));
-DATA(insert OID = 1658 (  "<>"		 PGUID 0 b t f 1625 1625   16 1658 1657 0 0 lztext_ne neqsel neqjoinsel ));
-DATA(insert OID = 1659 (  "<"	 PGUID 0 b t f 1625 1625   16 1661 1662 0 0 lztext_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1660 (  "<="		 PGUID 0 b t f 1625 1625   16 1662 1661 0 0 lztext_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1661 (  ">"	 PGUID 0 b t f 1625 1625   16 1659 1660 0 0 lztext_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1662 (  ">="		 PGUID 0 b t f 1625 1625   16 1660 1659 0 0 lztext_ge scalargtsel scalargtjoinsel ));
-
 DATA(insert OID = 1784 (  "="	  PGUID 0 b t f 1560 1560	16 1784 1785 1786 1786 biteq eqsel eqjoinsel ));
 DATA(insert OID = 1785 (  "<>"	  PGUID 0 b t f 1560 1560	16 1785 1784	0	 0 bitne neqsel neqjoinsel ));
 DATA(insert OID = 1786 (  "<"	  PGUID 0 b t f 1560 1560	16 1787 1789	0	 0 bitlt scalarltsel scalarltjoinsel ));
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index a75e7880f72356395918ede20d015dbb8ddc2688..6b833400c08dd60b8416ce709409084c1d3eb422 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.152 2000/07/30 20:43:44 tgl Exp $
+ * $Id: pg_proc.h,v 1.153 2000/07/30 22:14:01 tgl Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -981,11 +981,6 @@ DESCR("array");
 DATA(insert OID = 751 (  array_out		   PGUID 12 f t t t 2 f 23 "0 26" 100 0 0 100	array_out - ));
 DESCR("array");
 
-DATA(insert OID = 752 (  filename_in	   PGUID 11 f t t t 1 f 605 "0" 100 0 0 100  filename_in - ));
-DESCR("(internal)");
-DATA(insert OID = 753 (  filename_out	   PGUID 11 f t t t 2 f 23  "0 26" 100 0 0 100  filename_out - ));
-DESCR("(internal)");
-
 DATA(insert OID = 760 (  smgrin			   PGUID 12 f t f t 1 f 210 "0" 100 0 0 100  smgrin - ));
 DESCR("storage manager(internal)");
 DATA(insert OID = 761 (  smgrout		   PGUID 12 f t f t 1 f 23  "0" 100 0 0 100  smgrout - ));
@@ -2044,38 +2039,6 @@ DATA(insert OID = 1623 (  varchar			PGUID 12 f t t t 1 f 1043 "20" 100 0 0 100
 DESCR("convert int8 to varchar");
 DATA(insert OID = 1624 (  mul_d_interval	PGUID 12 f t t t 2 f 1186 "701 1186" 100 0 0 100	mul_d_interval - ));
 
-/* OID's 1625 - 1639 LZTEXT data type */
-DATA(insert OID = 1626 ( lztextin			  PGUID 11 f t t t 1 f 1625 "0" 100 0 0 100  lztextin - ));
-DESCR("(internal)");
-DATA(insert OID = 1627 ( lztextout			  PGUID 11 f t t t 1 f 23 "0" 100 0 0 100  lztextout - ));
-DESCR("(internal)");
-DATA(insert OID = 1629 ( text				  PGUID 11 f t t t 1 f 25 "1625" 100 0 0 100	lztext_text -));
-DESCR("convert lztext to text");
-DATA(insert OID = 1631 ( lztext				  PGUID 12 f t t t 1 f 1625 "25" 100 0 0 100	text_lztext -));
-DESCR("convert text to lztext");
-DATA(insert OID = 1632 ( lztext				  PGUID 14 f t t t 1 f 1625 "1625" 100 0 0 100  "select $1" -));
-DESCR("convert text to lztext");
-DATA(insert OID = 1633 ( char_length		  PGUID 11 f t t t 1 f 23 "1625" 100 0 1 0  lztextlen - ));
-DESCR("length");
-DATA(insert OID = 1634 ( length				  PGUID 11 f t t t 1 f 23 "1625" 100 0 1 0  lztextlen - ));
-DESCR("length");
-DATA(insert OID = 1635 ( octet_length		  PGUID 11 f t t t 1 f 23 "1625" 100 0 1 0  lztextoctetlen - ));
-DESCR("octet length");
-DATA(insert OID = 1636 ( lztext_cmp			  PGUID 11 f t t t 2 f 23 "1625 1625" 100 0 1 0  lztext_cmp - ));
-DESCR("compare lztext");
-DATA(insert OID = 1637 ( lztext_eq			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_eq - ));
-DESCR("equal");
-DATA(insert OID = 1638 ( lztext_ne			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_ne - ));
-DESCR("not equal");
-DATA(insert OID = 1639 ( lztext_gt			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_gt - ));
-DESCR("greater-than");
-DATA(insert OID = 1664 ( lztext_ge			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_ge - ));
-DESCR("greater-than-or-equal");
-DATA(insert OID = 1665 ( lztext_lt			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_lt - ));
-DESCR("less-than");
-DATA(insert OID = 1656 ( lztext_le			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_le - ));
-DESCR("less-than-or-equal");
-
 DATA(insert OID = 1689 (  update_pg_pwd       PGUID 12 f t f t 0 f 0  ""  100 0 0 100  update_pg_pwd - ));
 DESCR("update pg_pwd file");
 
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index 09e0fa7c4900e7686cb8eb642e72fa35c63897d4..3de2c82b0984c05ad883454bdbe6f90553ab87aa 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_rewrite.h,v 1.11 2000/02/27 12:02:34 wieck Exp $
+ * $Id: pg_rewrite.h,v 1.12 2000/07/30 22:14:02 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -38,8 +38,9 @@ CATALOG(pg_rewrite)
 	Oid			ev_class;
 	int2		ev_attr;
 	bool		is_instead;
-	lztext		ev_qual;
-	lztext		ev_action;
+	/* NB: remaining fields must be accessed via heap_getattr */
+	text		ev_qual;
+	text		ev_action;
 } FormData_pg_rewrite;
 
 /* ----------------
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 0dfc5c9f19d8f70a1f13ac5c377b246217e6979d..7b9f702922205dd5078294b036291667b046483c 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.95 2000/07/29 18:46:00 tgl Exp $
+ * $Id: pg_type.h,v 1.96 2000/07/30 22:14:02 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -276,8 +276,6 @@ DESCR("geometric box '(lower left,upper right)'");
 DATA(insert OID = 604 (  polygon   PGUID -1  -1 f b t \054 0   0 poly_in poly_out poly_in poly_out d x _null_ ));
 DESCR("geometric polygon '(pt1,...)'");
 #define POLYGONOID		604
-DATA(insert OID = 605 (  filename  PGUID 256 -1 f b t \054 0  18 filename_in filename_out filename_in filename_out i p _null_ ));
-DESCR("filename used in system tables");
 
 DATA(insert OID = 628 (  line	   PGUID 32  48 f b t \054 0 701 line_in line_out line_in line_out d p _null_ ));
 DESCR("geometric line '(pt1,pt2)'");
@@ -354,7 +352,6 @@ DATA(insert OID = 1022 (  _float8	 PGUID -1  -1 f b t \054 0 701 array_in array_
 DATA(insert OID = 1023 (  _abstime	 PGUID -1  -1 f b t \054 0 702 array_in array_out array_in array_out i x _null_ ));
 DATA(insert OID = 1024 (  _reltime	 PGUID -1  -1 f b t \054 0 703 array_in array_out array_in array_out i x _null_ ));
 DATA(insert OID = 1025 (  _tinterval PGUID -1  -1 f b t \054 0 704 array_in array_out array_in array_out i x _null_ ));
-DATA(insert OID = 1026 (  _filename  PGUID -1  -1 f b t \054 0 605 array_in array_out array_in array_out i x _null_ ));
 DATA(insert OID = 1027 (  _polygon	 PGUID -1  -1 f b t \054 0 604 array_in array_out array_in array_out d x _null_ ));
 /*
  *	Note: the size of aclitem needs to match sizeof(AclItem) in acl.h.
@@ -412,9 +409,6 @@ DESCR("fixed-length bit string");
 DATA(insert OID = 1563 ( _varbit	 PGUID	-1 -1 f b t \054 0	1562 array_in array_out array_in array_out i x _null_ ));
 
 /* OIDS 1600 - 1699 */
-DATA(insert OID = 1625 ( lztext		 PGUID -1  -1 f b t \054 0	0 lztextin lztextout lztextin lztextout i x _null_ ));
-DESCR("variable-length string, stored compressed");
-#define LZTEXTOID	  1625
 
 /* OIDS 1700 - 1799 */
 DATA(insert OID = 1700 ( numeric	   PGUID -1  -1 f b t \054 0  0 numeric_in numeric_out numeric_in numeric_out i m _null_ ));
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 4d5aeff643d9a9fe5119a48583873102cde2d90c..dfbc422993935f5d9c0ebe66641d840d8eb9b663 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.126 2000/07/29 18:46:05 tgl Exp $
+ * $Id: builtins.h,v 1.127 2000/07/30 22:14:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include "storage/itemptr.h"
 #include "utils/inet.h"
 #include "utils/numeric.h"
-#include "utils/lztext.h"
 
 /*
  *		Defined in adt/
@@ -562,21 +561,6 @@ extern Datum int2_sum(PG_FUNCTION_ARGS);
 extern Datum int4_sum(PG_FUNCTION_ARGS);
 extern Datum int8_sum(PG_FUNCTION_ARGS);
 
-/* lztext.c */
-extern lztext  *lztextin(char *str);
-extern char	   *lztextout(lztext *lz);
-extern text	   *lztext_text(lztext *lz);
-extern Datum	text_lztext(PG_FUNCTION_ARGS);
-extern int32	lztextlen(lztext *lz);
-extern int32	lztextoctetlen(lztext *lz);
-extern int32	lztext_cmp(lztext *lz1, lztext *lz2);
-extern bool		lztext_eq(lztext *lz1, lztext *lz2);
-extern bool		lztext_ne(lztext *lz1, lztext *lz2);
-extern bool		lztext_gt(lztext *lz1, lztext *lz2);
-extern bool		lztext_ge(lztext *lz1, lztext *lz2);
-extern bool		lztext_lt(lztext *lz1, lztext *lz2);
-extern bool		lztext_le(lztext *lz1, lztext *lz2);
-
 /* ri_triggers.c */
 extern Datum RI_FKey_check_ins(PG_FUNCTION_ARGS);
 extern Datum RI_FKey_check_upd(PG_FUNCTION_ARGS);
diff --git a/src/include/utils/lztext.h b/src/include/utils/lztext.h
deleted file mode 100644
index be57c7478b7c3c0fb01c56d4dff379306921254f..0000000000000000000000000000000000000000
--- a/src/include/utils/lztext.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ----------
- * lztext.h
- *
- * $Header: /cvsroot/pgsql/src/include/utils/Attic/lztext.h,v 1.4 2000/07/03 23:10:14 wieck Exp $
- *
- *	Definitions for the lztext compressed data type
- * ----------
- */
-
-#ifndef _LZTEXT_H_
-#define _LZTEXT_H_
-
-/* ----------
- * The internal storage format of an LZ compressed text field is varattrib
- * ----------
- */
-typedef varattrib lztext;
-
-#endif	 /* _LZTEXT_H_ */
diff --git a/src/test/regress/expected/opr_sanity.out b/src/test/regress/expected/opr_sanity.out
index 18582c1f5bbf07179d9cc1647816a6413cc19a56..8b84e833662fab105ce599811145167e7598faa0 100644
--- a/src/test/regress/expected/opr_sanity.out
+++ b/src/test/regress/expected/opr_sanity.out
@@ -480,8 +480,8 @@ WHERE p1.aggtransfn = p2.oid AND
           (p2.pronargs = 1 AND p1.aggbasetype = 0)));
   oid  | aggname | oid |   proname   
 -------+---------+-----+-------------
- 16978 | max     | 768 | int4larger
- 16992 | min     | 769 | int4smaller
+ 16972 | max     | 768 | int4larger
+ 16986 | min     | 769 | int4smaller
 (2 rows)
 
 -- Cross-check finalfn (if present) against its entry in pg_proc.