*** pgsql/src/pl/plperl/plperl.c	2010/05/13 16:44:03	1.67.4.12
--- pgsql/src/pl/plperl/plperl.c	2010/05/17 20:46:12	1.67.4.13
***************
*** 33,39 ****
   *	  ENHANCEMENTS, OR MODIFICATIONS.
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.67.4.11 2010/03/09 22:35:25 tgl Exp $
   *
   **********************************************************************/
  
--- 33,39 ----
   *	  ENHANCEMENTS, OR MODIFICATIONS.
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.67.4.12 2010/05/13 16:44:03 adunstan Exp $
   *
   **********************************************************************/
  
*************** plperl_safe_init(void)
*** 527,533 ****
  	if (SvTRUE(ERRSV))
  		ereport(ERROR,
  				(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 				 errcontext("While executing PLC_TRUSTED.")));
  
  	if (GetDatabaseEncoding() == PG_UTF8)
  	{
--- 527,533 ----
  	if (SvTRUE(ERRSV))
  		ereport(ERROR,
  				(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 				 errcontext("while executing PLC_TRUSTED")));
  
  	if (GetDatabaseEncoding() == PG_UTF8)
  	{
*************** plperl_safe_init(void)
*** 540,546 ****
  		if (SvTRUE(ERRSV))
  			ereport(ERROR,
  					(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					 errcontext("While executing utf8fix.")));
  
  	}
  
--- 540,546 ----
  		if (SvTRUE(ERRSV))
  			ereport(ERROR,
  					(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					 errcontext("while executing utf8fix")));
  
  	}