diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog index 83c40f9caafcbf698adf3d839fec38ca30bdfad4..99c28a7439f2082cac5593b9dd63df4cb9c254d1 100644 --- a/src/interfaces/ecpg/ChangeLog +++ b/src/interfaces/ecpg/ChangeLog @@ -694,3 +694,9 @@ Wed Oct 27 18:08:09 CEST 1999 - Synced preproc.y with gram.y. - Set ecpg version to 2.6.8 + +Fri Oct 29 21:36:25 CEST 1999 + + - Fixed bug that caused ecpg to not allow FOR UPDATE. + - Set ecpg version to 2.6.9 + diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index 713ccfe1be87b93e5b6783739851620e5b6bf727..bbf33db0bb941c8bc932f2977b1481a764f9d391 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global MAJOR_VERSION=2 MINOR_VERSION=6 -PATCHLEVEL=8 +PATCHLEVEL=9 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \ -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \ diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 788e37c34001843a8244cd27c95bcf9159159785..49bc9d7867b7659ad734f277d7dda31dfeae416b 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -2792,9 +2792,9 @@ SubSelect: SELECT opt_unique target_list result from_clause where_clause group_clause having_clause { - $$ = cat4_str(cat5_str(make1_str("select"), $2, $3, $4, $5), $6, $7, $8); if (strlen($7) > 0 || strlen($8) > 0) ForUpdateNotAllowed = 1; + $$ = cat4_str(cat5_str(make1_str("select"), $2, $3, $4, $5), $6, $7, $8); } ;