*** pgsql/src/pl/plperl/expected/plperl.out	2010/02/17 05:32:48	1.20
--- pgsql/src/pl/plperl/expected/plperl.out	2010/05/13 16:39:43	1.21
*************** $$ LANGUAGE plperl;
*** 563,570 ****
  NOTICE:  This is a test
  CONTEXT:  PL/Perl anonymous code block
  -- check that restricted operations are rejected in a plperl DO block
! DO $$ eval "1+1"; $$ LANGUAGE plperl;
! ERROR:  'eval "string"' trapped by operation mask at line 1.
  CONTEXT:  PL/Perl anonymous code block
  -- check that we can't "use" a module that's not been loaded already
  -- compile-time error: "Unable to load blib.pm into plperl"
--- 563,585 ----
  NOTICE:  This is a test
  CONTEXT:  PL/Perl anonymous code block
  -- check that restricted operations are rejected in a plperl DO block
! DO $$ system("/nonesuch"); $$ LANGUAGE plperl;
! ERROR:  'system' trapped by operation mask at line 1.
! CONTEXT:  PL/Perl anonymous code block
! DO $$ qx("/nonesuch"); $$ LANGUAGE plperl;
! ERROR:  'quoted execution (``, qx)' trapped by operation mask at line 1.
! CONTEXT:  PL/Perl anonymous code block
! DO $$ open my $fh, "</nonesuch"; $$ LANGUAGE plperl;
! ERROR:  'open' trapped by operation mask at line 1.
! CONTEXT:  PL/Perl anonymous code block
! -- check that eval is allowed and eval'd restricted ops are caught
! DO $$ eval q{chdir '.'}; warn "Caught: $@"; $$ LANGUAGE plperl;
! WARNING:  Caught: 'chdir' trapped by operation mask at line 2.
! CONTEXT:  PL/Perl anonymous code block
! -- check that compiling do (dofile opcode) is allowed
! -- but that executing it for a file not already loaded (via require) dies
! DO $$ warn do "/dev/null"; $$ LANGUAGE plperl;
! ERROR:  Unable to load /dev/null into plperl at line 1.
  CONTEXT:  PL/Perl anonymous code block
  -- check that we can't "use" a module that's not been loaded already
  -- compile-time error: "Unable to load blib.pm into plperl"