Commit77838f7

committed

Currently, nonfatal warnings are not trapped (as they should be) by

plperl - the attached small patch remedies that omission.Andrew Dunstan

1 parent970bb03 commit77838f7Copy full SHA for 77838f7

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Makefile for PL/Perl`
`2`		`-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.22 2005/05/24 17:07:41 tgl Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.23 2005/07/06 22:33:39 momjian Exp $`
`3`	`3`
`4`	`4`	`subdir = src/pl/plperl`
`5`	`5`	`top_builddir = ../../..`
`@@ -37,7 +37,7 @@ OBJS = plperl.o spi_internal.o SPI.o`
`37`	`37`	`SHLIB_LINK =$(perl_embed_ldflags)$(BE_DLLLIBS)`
`38`	`38`
`39`	`39`	`REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl`
`40`		`-REGRESS = plperl plperl_trigger plperl_shared`
	`40`	`+REGRESS = plperl plperl_trigger plperl_shared plperl_elog`
`41`	`41`
`42`	`42`	`include$(top_srcdir)/src/Makefile.shlib`
`43`	`43`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`* ENHANCEMENTS, OR MODIFICATIONS.`
`34`	`34`	`*`
`35`	`35`	`* IDENTIFICATION`
`36`		`- * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.79 2005/07/03 21:56:16 tgl Exp $`
	`36`	`+ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.80 2005/07/06 22:33:39 momjian Exp $`
`37`	`37`	`*`
`38`	`38`	`**********************************************************************/`
`39`	`39`
`@@ -190,13 +190,17 @@ plperl_init_interp(void)`
`190`	`190`	`"","-e",`
`191`	`191`	`/* all one string follows (no commas please) */`
`192`	`192`	`"SPI::bootstrap(); use vars qw(%_SHARED);"`
	`193`	`+"sub ::plperl_warn { my $msg = shift; &elog(&NOTICE, $msg); } "`
	`194`	`+"$SIG{__WARN__} = \\&::plperl_warn; "`
`193`	`195`	`"sub ::mkunsafefunc {return eval(qq[ sub { $_[0] $_[1] } ]); }"`
`194`	`196`	`};`
`195`	`197`
`196`	`198`	`staticchar*strict_embedding[3]= {`
`197`	`199`	`"","-e",`
`198`	`200`	`/* all one string follows (no commas please) */`
`199`	`201`	`"SPI::bootstrap(); use vars qw(%_SHARED);"`
	`202`	`+"sub ::plperl_warn { my $msg = shift; &elog(&NOTICE, $msg); } "`
	`203`	`+"$SIG{__WARN__} = \\&::plperl_warn; "`
`200`	`204`	`"sub ::mkunsafefunc {return eval("`
`201`	`205`	`"qq[ sub { use strict; $_[0] $_[1] } ]); }"`
`202`	`206`	`};`

Comments

(0)