summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTatsuo Ishii <ishii@postgresql.org>2005-05-25 02:03:52 +0000
committerTatsuo Ishii <ishii@postgresql.org>2005-05-25 02:03:52 +0000
commit5454eb04567cf04361546f34cc1e7d90a5818160 (patch)
treed701009abe3bb9680ae6b773ea2faf9883d3b8f0 /src
parent8f5702ebd514faf5ddcd4c3443567bfa9bd9f98a (diff)
Fix previous patch to exprTypmod.
Diffstat (limited to 'src')
-rw-r--r--src/backend/parser/parse_expr.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 745bc9e7877..9bdee98dafb 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.129.2.2 2005/05/24 23:52:02 ishii Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.129.2.3 2005/05/25 02:03:52 ishii Exp $
*
*-------------------------------------------------------------------------
*/
@@ -981,11 +981,12 @@ exprTypmod(Node *expr)
case BPCHAROID:
if (!con->constisnull)
{
- int32 len = VARSIZE(DatumGetPointer(con->constvalue));
+ int32 len = VARSIZE(DatumGetPointer(con->constvalue)) - VARHDRSZ;
if (pg_database_encoding_max_length() > 1)
len = pg_mbstrlen_with_len(VARDATA(DatumGetPointer(con->constvalue)), len);
- return len;
+
+ return len + VARHDRSZ;
}
break;
default: