From 969093b7858bf739b28d3827bccb7032a42e18df Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Fri, 29 Oct 1999 19:39:31 +0000
Subject: [PATCH] *** empty log message ***

---
 src/interfaces/ecpg/ChangeLog         | 6 ++++++
 src/interfaces/ecpg/preproc/Makefile  | 2 +-
 src/interfaces/ecpg/preproc/preproc.y | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 83c40f9caa..99c28a7439 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 713ccfe1be..bbf33db0bb 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 788e37c340..49bc9d7867 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);
 				}
 		;