There where a few more problems fixed by the patch below.

      o configure.in

Jan.

diff --git a/src/configure.in b/src/configure.in
index 81208640fd613470f4fcc22ab3db9f7a5910a6a1..71525c35b3d3efd51d9a6f706762b3c1512215b2 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -817,6 +817,11 @@ if test "$USE_TCL"; then
                                fi
                        fi
                done
+               if test -z "$TCL_CONFIG_SH"; then
+                       if test -d "$dir" -a -r "$dir/tclConfig.sh"; then
+                               TCL_CONFIG_SH=$dir/tclConfig.sh
+                       fi
+               fi
        done
        if test -z "$TCL_CONFIG_SH"; then
                AC_MSG_RESULT(no)

diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in
index 7c55b8809394ce60f560d913fe3fbed69782dd4d..25c81c7c8c249f0d1e524a61db56260c7833beba 100644 (file)
--- a/src/pl/plpgsql/src/Makefile.in
+++ b/src/pl/plpgsql/src/Makefile.in
@@ -79,7 +79,9 @@ endif
 #
 DLOBJ= plpgsql$(DLSUFFIX)
 
-OBJS=  pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
+OBJS=  plpgsql.o
+
+PLOBJS=        pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
 
 ALL=   $(DLOBJ)
 
@@ -88,6 +90,9 @@ ALL=  $(DLOBJ)
 #
 all: $(ALL)
 
+$(OBJS):       $(PLOBJS)
+       $(LD) -r -o $(OBJS) $(PLOBJS)
+
 $(DLOBJ):      $(OBJS)
 
 #

diff --git a/src/pl/tcl/mkMakefile.tcldefs.sh.in b/src/pl/tcl/mkMakefile.tcldefs.sh.in
index 95491d7279d4999da8de79dd4d005aef53cec545..c3981dd3102b246bfe39843e494e79ee56f73f27 100644 (file)
--- a/src/pl/tcl/mkMakefile.tcldefs.sh.in
+++ b/src/pl/tcl/mkMakefile.tcldefs.sh.in
@@ -8,5 +8,8 @@ else
     exit 1
 fi
 
-set | grep '^TCL' > Makefile.tcldefs
+for v in `set | grep '^TCL' | sed -e 's/=.*//'` ; do
+    echo $v = `eval "echo \\$$v"`
+done >Makefile.tcldefs
+
 exit 0

diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 8971c2a4a3049e62d789b6fc74a82809cb69fd5c..b3414072a8ce7ab296dca74691e3271d13c10429 100644 (file)
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -417,12 +417,6 @@ pltcl_call_handler(FmgrInfo *proinfo,
 
        pltcl_call_level--;
 
-       /************************************************************
-        * Disconnect from SPI manager
-        ************************************************************/
-       if (SPI_finish() != SPI_OK_FINISH)
-               elog(ERROR, "pltcl: SPI_finish() failed");
-
        return retval;
 }
 
@@ -731,6 +725,15 @@ pltcl_func_handler(FmgrInfo *proinfo,
                siglongjmp(Warn_restart, 1);
        }
 
+       /************************************************************
+        * Disconnect from SPI manager and then create the return
+        * values datum (if the input function does a palloc for it
+        * this must not be allocated in the SPI memory context
+        * because SPI_finish would free it).
+        ************************************************************/
+       if (SPI_finish() != SPI_OK_FINISH)
+               elog(ERROR, "pltcl: SPI_finish() failed");
+
        retval = (Datum) (*fmgr_faddr(&prodesc->result_in_func))
                (pltcl_safe_interp->result,
                 prodesc->result_in_elem,
@@ -1051,8 +1054,12 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
         * The return value from the procedure might be one of
         * the magic strings OK or SKIP or a list from array get
         ************************************************************/
-       if (strcmp(pltcl_safe_interp->result, "OK") == 0)
+       if (SPI_finish() != SPI_OK_FINISH)
+               elog(ERROR, "pltcl: SPI_finish() failed");
+
+       if (strcmp(pltcl_safe_interp->result, "OK") == 0) {
                return rettup;
+       }
        if (strcmp(pltcl_safe_interp->result, "SKIP") == 0)
        {
                return (HeapTuple) NULL;;
@@ -1309,7 +1316,7 @@ pltcl_SPI_exec(ClientData cdata, Tcl_Interp * interp,
        int                     loop_rc;
        int                     ntuples;
        HeapTuple  *tuples;
-       TupleDesc       tupdesc;
+       TupleDesc       tupdesc = NULL;
        sigjmp_buf      save_restart;
 
        char       *usage = "syntax error - 'SPI_exec "