From 16f4994ff004c3baca3b3cbdf6e191d4651b9046 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Thu, 4 Jun 2009 16:00:11 +0000 Subject: [PATCH] Initialise perl library as documented in perl API. Backpatch to release 7.4. --- src/pl/plperl/plperl.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 452c69cec7..20cfb51a8b 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -1,7 +1,7 @@ /********************************************************************** * plperl.c - perl as a procedural language for PostgreSQL * - * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.136 2008/01/23 00:55:47 adunstan Exp $ + * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.136.2.1 2009/06/04 16:00:11 adunstan Exp $ * **********************************************************************/ @@ -386,6 +386,8 @@ plperl_init_interp(void) "", "-e", PERLBOOT }; + int nargs = 3; + #ifdef WIN32 /* @@ -429,13 +431,19 @@ plperl_init_interp(void) #endif +#ifdef PERL_SYS_INIT3 + /* only call this the first time through, as per perlembed man page */ + if (interp_state == INTERP_NONE) + PERL_SYS_INIT3(&nargs, (char ***) &embedding, NULL); +#endif + plperl_held_interp = perl_alloc(); if (!plperl_held_interp) elog(ERROR, "could not allocate Perl interpreter"); perl_construct(plperl_held_interp); perl_parse(plperl_held_interp, plperl_init_shared_libs, - 3, embedding, NULL); + nargs, embedding, NULL); perl_run(plperl_held_interp); if (interp_state == INTERP_NONE) -- 2.50.0