*** empty log message ***

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index e77ecf377b72d4b5184e99980273da376784984f..52b148951e86753fa91f9c2c3012911694ae1229 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -595,5 +595,9 @@ Thu Jun 10 21:09:12 CEST 1999
 
        - Fixed typo in preproc.y.
        - Synced pgc.l with scan.l.
+
+Wed Jun 16 20:21:42 CEST 1999
+
+       - Fixed another typo in preproc.y.
        - Set library version to 3.0.0
        - Set ecpg version to 2.6.0

diff --git a/src/interfaces/ecpg/TODO b/src/interfaces/ecpg/TODO
index 114500850c66f3a19f07042016fbe9d17a1eee56..6cc52af293dddecd76f56ffa78e52031e7eda3ec 100644 (file)
--- a/src/interfaces/ecpg/TODO
+++ b/src/interfaces/ecpg/TODO
@@ -11,6 +11,10 @@ it would be nice to be able to use :var[:index] as cvariable
 
 support for dynamic SQL with unknown number of variables with DESCRIPTORS
 
+Allow INTO clause in cursor definition instead of FETCH clause. (Informix
+does this, Oracle not. But does it work with standard syntax? Or is it even
+standard?)
+
 The line numbering is not exact.
 
 Missing statements:

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index d541dbf0c8550027968a904163d753030eed77a1..9d21b064e575f84c1ea6b62fc8d3df5cbd885c4c 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -2814,7 +2814,7 @@ select_clause: '(' select_clause ')'
                        }
                | select_clause UNION opt_union select_clause
                        {
-                               $$ = cat3_str($1, make1_str("union"), $3);
+                               $$ = cat4_str($1, make1_str("union"), $3, $4);
                                ForUpdateNotAllowed = 1;
                        }
                | select_clause INTERSECT opt_union select_clause