aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuo Ishii <ishii@postgresql.org>2000-01-23 08:13:34 +0000
committerTatsuo Ishii <ishii@postgresql.org>2000-01-23 08:13:34 +0000
commitcfe717714c2a2dd96c3223086bda4b329812705c (patch)
tree1c914852079c77361748a6f386ac32a1c8f227de
parent27fee810ff9968a1034fea4bba4cd8d078c5d2d1 (diff)
downloadpostgresql-cfe717714c2a2dd96c3223086bda4b329812705c.tar.gz
postgresql-cfe717714c2a2dd96c3223086bda4b329812705c.zip
char_length()/octet_length for char() type now returns length of
the charcter including trailing blanks.
-rw-r--r--src/backend/utils/adt/varchar.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index c821a35a2df..e8cd0875502 100644
--- 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.56 2000/01/15 02:59:38 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.57 2000/01/23 08:13:34 ishii Exp $
*
*-------------------------------------------------------------------------
*/
@@ -462,7 +462,7 @@ bpcharlen(char *arg)
if (!PointerIsValid(arg))
elog(ERROR, "Bad (null) char() external representation");
#ifdef MULTIBYTE
- l = bcTruelen(arg);
+ l = VARSIZE(arg) - VARHDRSZ;
len = 0;
s = VARDATA(arg);
while (l > 0)
@@ -474,7 +474,7 @@ bpcharlen(char *arg)
}
return (len);
#else
- return bcTruelen(arg);
+ return (VARSIZE(arg) - VARHDRSZ);
#endif
}
@@ -484,7 +484,7 @@ bpcharoctetlen(char *arg)
if (!PointerIsValid(arg))
elog(ERROR, "Bad (null) char() external representation");
- return bcTruelen(arg);
+ return (VARSIZE(arg) - VARHDRSZ);
}
bool