From: Michael Meskes <meskes@postgresql.org>
Date: Tue, 31 Oct 2000 15:11:38 +0000 (+0000)
Subject: Added patch by Christof Petig <christof.petig@wtal.de> that fixes some bugs in preproc.y.
X-Git-Tag: REL7_1_BETA~302
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fae180f4777a09d302c54c874f11349fd0323bfb;p=postgresql

Added patch by Christof Petig <christof.petig@wtal.de> that fixes some bugs in preproc.y.
---

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index f29ec9b532..cff09a8d0c 100644
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -999,5 +999,10 @@ Son Oct 29 11:26:06 CET 2000
 Mon Oct 30 15:27:12 CET 2000
 
 	- Synced gram.y and preproc.y. 
+
+Tue Oct 31 16:09:55 CET 2000
+
+	- Added patch by Christof Petig <christof.petig@wtal.de> fixing some
+	  parser bugs.
 	- Set ecpg version to 2.8.0. 
 	- Set library version to 3.2.0.
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 888452f0c9..1a0beba3e6 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -2758,11 +2758,11 @@ table_ref:  relation_expr
                 }
 	| relation_expr alias_clause 
 		{
-			cat2_str($1, $2);
+			$$= cat2_str($1, $2);
 		}
 	| '(' select_subclause ')' alias_clause 
 		{
-			cat_str(4, make_str("("), $2, make_str(")"), $4);
+			$$=cat_str(4, make_str("("), $2, make_str(")"), $4);
 		}
 	| joined_table  
 		{
@@ -2770,7 +2770,7 @@ table_ref:  relation_expr
                 }  
 	| '(' joined_table ')' alias_clause   
                 {
-                        cat_str(4, make_str("("), $2, make_str(")"), $4);
+                        $$=cat_str(4, make_str("("), $2, make_str(")"), $4);
                 }             
 	;