Re-install working varchar() with compress size.

diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index 16ed0ea93e910e90ea166b61309ade37bbd5e4e6..3696661f1530e105a2ae6e9453a11f3d6cd00214 100644 (file)
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.21 1998/01/08 04:19:16 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.22 1998/01/08 04:58:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -132,11 +132,8 @@ varcharin(char *s, int dummy, int typlen)
        if (s == NULL)
                return ((char *) NULL);
 
-       if (typlen == -1)       /* we will remove this soon to make compact storage */
-                                               /* change varcharlen at the same time to use VARSIZE */
-               len = strlen(s) + VARHDRSZ;
-/*     if (typlen != -1 && len > typlen) */
-       else
+       len = strlen(s) + VARHDRSZ;
+       if (typlen != -1 && len > typlen)
                len = typlen;   /* clip the string at max length */
 
        if (len > 4096)