Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit40703f2

Browse files
committed
There where a few more problems fixed by the patch below.
 o configure.inJan.
1 parent1483456 commit40703f2

File tree

4 files changed

+32
-12
lines changed

4 files changed

+32
-12
lines changed

‎src/configure.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,11 @@ if test "$USE_TCL"; then
817817
fi
818818
fi
819819
done
820+
if test -z "$TCL_CONFIG_SH"; then
821+
if test -d "$dir" -a -r "$dir/tclConfig.sh"; then
822+
TCL_CONFIG_SH=$dir/tclConfig.sh
823+
fi
824+
fi
820825
done
821826
if test -z "$TCL_CONFIG_SH"; then
822827
AC_MSG_RESULT(no)

‎src/pl/plpgsql/src/Makefile.in‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the plpgsql shared object
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.4 1998/10/0904:50:12 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.5 1998/10/0916:57:07 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -79,7 +79,9 @@ endif
7979
#
8080
DLOBJ= plpgsql$(DLSUFFIX)
8181

82-
OBJS=pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
82+
OBJS=plpgsql.o
83+
84+
PLOBJS=pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
8385

8486
ALL=$(DLOBJ)
8587

@@ -88,6 +90,9 @@ ALL=$(DLOBJ)
8890
#
8991
all:$(ALL)
9092

93+
$(OBJS):$(PLOBJS)
94+
$(LD) -r -o$(OBJS)$(PLOBJS)
95+
9196
$(DLOBJ):$(OBJS)
9297

9398
#

‎src/pl/tcl/mkMakefile.tcldefs.sh.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ else
88
exit 1
99
fi
1010

11-
set| grep'^TCL'> Makefile.tcldefs
11+
forvin`set| grep'^TCL'| sed -e's/=.*//'`;do
12+
echo$v =`eval"echo\\$$v"`
13+
done>Makefile.tcldefs
14+
1215
exit 0

‎src/pl/tcl/pltcl.c‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* procedural language (PL)
44
*
55
* IDENTIFICATION
6-
* $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.6 1998/09/01 04:40:28 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.7 1998/10/09 16:57:10 momjian Exp $
77
*
88
* This software is copyrighted by Jan Wieck - Hamburg.
99
*
@@ -417,12 +417,6 @@ pltcl_call_handler(FmgrInfo *proinfo,
417417

418418
pltcl_call_level--;
419419

420-
/************************************************************
421-
* Disconnect from SPI manager
422-
************************************************************/
423-
if (SPI_finish()!=SPI_OK_FINISH)
424-
elog(ERROR,"pltcl: SPI_finish() failed");
425-
426420
returnretval;
427421
}
428422

@@ -731,6 +725,15 @@ pltcl_func_handler(FmgrInfo *proinfo,
731725
siglongjmp(Warn_restart,1);
732726
}
733727

728+
/************************************************************
729+
* Disconnect from SPI manager and then create the return
730+
* values datum (if the input function does a palloc for it
731+
* this must not be allocated in the SPI memory context
732+
* because SPI_finish would free it).
733+
************************************************************/
734+
if (SPI_finish()!=SPI_OK_FINISH)
735+
elog(ERROR,"pltcl: SPI_finish() failed");
736+
734737
retval= (Datum) (*fmgr_faddr(&prodesc->result_in_func))
735738
(pltcl_safe_interp->result,
736739
prodesc->result_in_elem,
@@ -1051,8 +1054,12 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
10511054
* The return value from the procedure might be one of
10521055
* the magic strings OK or SKIP or a list from array get
10531056
************************************************************/
1054-
if (strcmp(pltcl_safe_interp->result,"OK")==0)
1057+
if (SPI_finish()!=SPI_OK_FINISH)
1058+
elog(ERROR,"pltcl: SPI_finish() failed");
1059+
1060+
if (strcmp(pltcl_safe_interp->result,"OK")==0) {
10551061
returnrettup;
1062+
}
10561063
if (strcmp(pltcl_safe_interp->result,"SKIP")==0)
10571064
{
10581065
return (HeapTuple)NULL;;
@@ -1309,7 +1316,7 @@ pltcl_SPI_exec(ClientData cdata, Tcl_Interp * interp,
13091316
intloop_rc;
13101317
intntuples;
13111318
HeapTuple*tuples;
1312-
TupleDesctupdesc;
1319+
TupleDesctupdesc=NULL;
13131320
sigjmp_bufsave_restart;
13141321

13151322
char*usage="syntax error - 'SPI_exec "

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp