*** parse_expr.c.orig	2005-01-13 02:32:36.000000000 +0900
--- parse_expr.c	2005-05-22 17:12:37.000000000 +0900
***************
*** 18,23 ****
--- 18,24 ----
  #include "catalog/pg_operator.h"
  #include "catalog/pg_proc.h"
  #include "commands/dbcommands.h"
+ #include "mb/pg_wchar.h"
  #include "miscadmin.h"
  #include "nodes/makefuncs.h"
  #include "nodes/params.h"
***************
*** 34,40 ****
  #include "utils/lsyscache.h"
  #include "utils/syscache.h"
  
- 
  bool		Transform_null_equals = false;
  
  static Node *transformColumnRef(ParseState *pstate, ColumnRef *cref);
--- 35,40 ----
***************
*** 1491,1497 ****
  				{
  					case BPCHAROID:
  						if (!con->constisnull)
! 							return VARSIZE(DatumGetPointer(con->constvalue));
  						break;
  					default:
  						break;
--- 1491,1503 ----
  				{
  					case BPCHAROID:
  						if (!con->constisnull)
! 						{
! 							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 + VARHDRSZ;
! 						}
  						break;
  					default:
  						break;