*** pgsql/src/pl/plperl/plperl.c	2010/03/09 22:34:38	1.171
--- pgsql/src/pl/plperl/plperl.c	2010/03/17 21:31:17	1.172
***************
*** 1,7 ****
  /**********************************************************************
   * plperl.c - perl as a procedural language for PostgreSQL
   *
!  *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.170 2010/03/09 02:48:33 adunstan Exp $
   *
   **********************************************************************/
  
--- 1,7 ----
  /**********************************************************************
   * plperl.c - perl as a procedural language for PostgreSQL
   *
!  *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.171 2010/03/09 22:34:38 tgl Exp $
   *
   **********************************************************************/
  
*************** _PG_init(void)
*** 246,252 ****
  							 NULL, NULL);
  
  	DefineCustomStringVariable("plperl.on_init",
! 							   gettext_noop("Perl initialization code to execute when a perl interpreter is initialized."),
  							   NULL,
  							   &plperl_on_init,
  							   NULL,
--- 246,252 ----
  							 NULL, NULL);
  
  	DefineCustomStringVariable("plperl.on_init",
! 							   gettext_noop("Perl initialization code to execute when a Perl interpreter is initialized."),
  							   NULL,
  							   &plperl_on_init,
  							   NULL,
*************** select_perl_context(bool trusted)
*** 422,428 ****
  	if (SvTRUE(ERRSV))
  		ereport(ERROR,
  				(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 		errdetail("While executing PostgreSQL::InServer::SPI::bootstrap.")));
  }
  
  /*
--- 422,428 ----
  	if (SvTRUE(ERRSV))
  		ereport(ERROR,
  				(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 		errcontext("while executing PostgreSQL::InServer::SPI::bootstrap")));
  }
  
  /*
*************** plperl_init_interp(void)
*** 560,571 ****
  				   nargs, embedding, NULL) != 0)
  		ereport(ERROR,
  				(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 				 errcontext("While parsing perl initialization.")));
  
  	if (perl_run(plperl) != 0)
  		ereport(ERROR,
  				(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 				 errcontext("While running perl initialization.")));
  
  #ifdef WIN32
  
--- 560,571 ----
  				   nargs, embedding, NULL) != 0)
  		ereport(ERROR,
  				(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 				 errcontext("while parsing Perl initialization")));
  
  	if (perl_run(plperl) != 0)
  		ereport(ERROR,
  				(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 				 errcontext("while running Perl initialization")));
  
  #ifdef WIN32
  
*************** plperl_trusted_init(void)
*** 703,709 ****
  		if (SvTRUE(ERRSV))
  			ereport(ERROR,
  					(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					 errcontext("While executing PLC_SAFE_BAD.")));
  	}
  	else
  	{
--- 703,709 ----
  		if (SvTRUE(ERRSV))
  			ereport(ERROR,
  					(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					 errcontext("while executing PLC_SAFE_BAD")));
  	}
  	else
  	{
*************** plperl_trusted_init(void)
*** 711,717 ****
  		if (SvTRUE(ERRSV))
  			ereport(ERROR,
  					(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					 errcontext("While executing PLC_SAFE_OK.")));
  
  		if (GetDatabaseEncoding() == PG_UTF8)
  		{
--- 711,717 ----
  		if (SvTRUE(ERRSV))
  			ereport(ERROR,
  					(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					 errcontext("while executing PLC_SAFE_OK")));
  
  		if (GetDatabaseEncoding() == PG_UTF8)
  		{
*************** plperl_trusted_init(void)
*** 724,730 ****
  			if (SvTRUE(ERRSV))
  				ereport(ERROR,
  						(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 						 errcontext("While executing utf8fix.")));
  		}
  
  		/* switch to the safe require opcode */
--- 724,730 ----
  			if (SvTRUE(ERRSV))
  				ereport(ERROR,
  						(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 						 errcontext("while executing utf8fix")));
  		}
  
  		/* switch to the safe require opcode */
*************** plperl_trusted_init(void)
*** 744,750 ****
  			if (SvTRUE(ERRSV))
  				ereport(ERROR,
  						(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					  errcontext("While executing plperl.on_plperl_init.")));
  		}
  
  	}
--- 744,750 ----
  			if (SvTRUE(ERRSV))
  				ereport(ERROR,
  						(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					  errcontext("while executing plperl.on_plperl_init")));
  		}
  
  	}
*************** plperl_untrusted_init(void)
*** 760,766 ****
  		if (SvTRUE(ERRSV))
  			ereport(ERROR,
  					(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					 errcontext("While executing plperl.on_plperlu_init.")));
  	}
  }
  
--- 760,766 ----
  		if (SvTRUE(ERRSV))
  			ereport(ERROR,
  					(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),
! 					 errcontext("while executing plperl.on_plperlu_init")));
  	}
  }