aboutsummaryrefslogtreecommitdiff
path: root/src/backend/parser/parse_expr.c
diff options
context:
space:
mode:
authorTatsuo Ishii <ishii@postgresql.org>2005-05-25 02:17:55 +0000
committerTatsuo Ishii <ishii@postgresql.org>2005-05-25 02:17:55 +0000
commitafc0e843b9618e999bab6030d264b908abffe500 (patch)
tree57c49bcd1681a57ab3ecda35206d6dc387b9e3dd /src/backend/parser/parse_expr.c
parent2a99455ca7f56cef0f0d77dee4c72ff430363668 (diff)
downloadpostgresql-afc0e843b9618e999bab6030d264b908abffe500.tar.gz
postgresql-afc0e843b9618e999bab6030d264b908abffe500.zip
Fix previous patch to exprTypmod.
Diffstat (limited to 'src/backend/parser/parse_expr.c')
-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 44936996508..9082efe7eaf 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.179.4.1 2005/05/24 23:02:54 ishii Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.179.4.2 2005/05/25 02:17:55 ishii Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1492,11 +1492,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: