git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/pl/plperl/expected/plperl_init.out b/src/pl/plperl/expected/plperl_init.out

index ef3d0ebf1d03b0eb84738a49b819043424943554..dca5d8f0ec660ca33ce73a67eedc969ec54df150 100644 (file)

--- a/src/pl/plperl/expected/plperl_init.out

+++ b/src/pl/plperl/expected/plperl_init.out

DO $$ warn 42 $$ language plperl;

ERROR: 'eval "string"' trapped by operation mask at line 2.

-CONTEXT: While executing plperl.on_plperl_init.

+CONTEXT: while executing plperl.on_plperl_init

PL/Perl anonymous code block

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c

index bc23d14e1e06264043ec49f892ba8b3cfbe47003..487ce1bc5c09dde8ba179bb842f4377e51d1d691 100644 (file)

--- a/src/pl/plperl/plperl.c

+++ b/src/pl/plperl/plperl.c

/**********************************************************************

* 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 $

+ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.172 2010年03月17日 21:31:17 petere Exp $

*

**********************************************************************/

NULL, NULL);

DefineCustomStringVariable("plperl.on_init",

- gettext_noop("Perl initialization code to execute when a perl interpreter is initialized."),

+ gettext_noop("Perl initialization code to execute when a Perl interpreter is initialized."),

NULL,

&plperl_on_init,

NULL,

if (SvTRUE(ERRSV))

ereport(ERROR,

(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),

- errdetail("While executing PostgreSQL::InServer::SPI::bootstrap.")));

+ errcontext("while executing PostgreSQL::InServer::SPI::bootstrap")));

}

/*

nargs, embedding, NULL) != 0)

ereport(ERROR,

(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),

- errcontext("While parsing perl initialization.")));

+ 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.")));

+ errcontext("while running Perl initialization")));

#ifdef WIN32

if (SvTRUE(ERRSV))

ereport(ERROR,

(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),

- errcontext("While executing PLC_SAFE_BAD.")));

+ errcontext("while executing PLC_SAFE_BAD")));

}

else

{

if (SvTRUE(ERRSV))

ereport(ERROR,

(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),

- errcontext("While executing PLC_SAFE_OK.")));

+ errcontext("while executing PLC_SAFE_OK")));

if (GetDatabaseEncoding() == PG_UTF8)

{

if (SvTRUE(ERRSV))

ereport(ERROR,

(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),

- errcontext("While executing utf8fix.")));

+ errcontext("while executing utf8fix")));

}

/* switch to the safe require opcode */

if (SvTRUE(ERRSV))

ereport(ERROR,

(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),

- errcontext("While executing plperl.on_plperl_init.")));

+ errcontext("while executing plperl.on_plperl_init")));

}

}

if (SvTRUE(ERRSV))

ereport(ERROR,

(errmsg("%s", strip_trailing_ws(SvPV_nolen(ERRSV))),

- errcontext("While executing plperl.on_plperlu_init.")));

+ errcontext("while executing plperl.on_plperlu_init")));

}

}