Index: src/pl/plperl/GNUmakefile
===================================================================
RCS file: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/pl/plperl/GNUmakefile	24 May 2005 17:07:41 -0000	1.22
--- src/pl/plperl/GNUmakefile	6 Jul 2005 22:33:39 -0000	1.23
***************
*** 1,5 ****
  # Makefile for PL/Perl
! # $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.22 2005/05/24 17:07:41 tgl Exp $
  
  subdir = src/pl/plperl
  top_builddir = ../../..
--- 1,5 ----
  # Makefile for PL/Perl
! # $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.23 2005/07/06 22:33:39 momjian Exp $
  
  subdir = src/pl/plperl
  top_builddir = ../../..
***************
*** 37,43 ****
  SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
  
  REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl
! REGRESS = plperl plperl_trigger plperl_shared
  
  include $(top_srcdir)/src/Makefile.shlib
  
--- 37,43 ----
  SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
  
  REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl
! REGRESS = plperl plperl_trigger plperl_shared plperl_elog
  
  include $(top_srcdir)/src/Makefile.shlib
  
Index: src/pl/plperl/plperl.c
===================================================================
RCS file: /cvsroot/pgsql/src/pl/plperl/plperl.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -c -r1.79 -r1.80
*** src/pl/plperl/plperl.c	3 Jul 2005 21:56:16 -0000	1.79
--- src/pl/plperl/plperl.c	6 Jul 2005 22:33:39 -0000	1.80
***************
*** 33,39 ****
   *	  ENHANCEMENTS, OR MODIFICATIONS.
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.79 2005/07/03 21:56:16 tgl Exp $
   *
   **********************************************************************/
  
--- 33,39 ----
   *	  ENHANCEMENTS, OR MODIFICATIONS.
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.80 2005/07/06 22:33:39 momjian Exp $
   *
   **********************************************************************/
  
***************
*** 190,195 ****
--- 190,197 ----
  		"", "-e",
  		/* all one string follows (no commas please) */
  		"SPI::bootstrap(); use vars qw(%_SHARED);"
+ 		"sub ::plperl_warn { my $msg = shift; &elog(&NOTICE, $msg); } "
+ 		"$SIG{__WARN__} = \\&::plperl_warn; "
  		"sub ::mkunsafefunc {return eval(qq[ sub { $_[0] $_[1] } ]); }"
  	};
  
***************
*** 197,202 ****
--- 199,206 ----
  		"", "-e",
  		/* all one string follows (no commas please) */
  		"SPI::bootstrap(); use vars qw(%_SHARED);"
+ 		"sub ::plperl_warn { my $msg = shift; &elog(&NOTICE, $msg); } "
+ 		"$SIG{__WARN__} = \\&::plperl_warn; "
  		"sub ::mkunsafefunc {return eval("
  		"qq[ sub { use strict; $_[0] $_[1] } ]); }"
  	};