[Firebird-checkins] CVS: firebird2/src/dsql pass1.cpp, 1.260.2.11, 1.260.2.12

[Dmitry Y. <di...@us...>]

Build Version :  T3.0.0.28601 Firebird 3.0 Unstable

(writeBuildNum.sh,v 1.28776 2010/07/02 10:31:22 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/dsql
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23485

Modified Files:
      Tag: B2_0_Release
	pass1.cpp 
Log Message:
Fixed CORE-3064: Using the procedure alias inside an explicit plan crashes the server.

Index: pass1.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dsql/pass1.cpp,v
retrieving revision 1.260.2.11
retrieving revision 1.260.2.12
diff -b -U3 -r1.260.2.11 -r1.260.2.12
--- pass1.cpp	27 Jun 2008 11:28:13 -0000	1.260.2.11
+++ pass1.cpp	2 Jul 2010 10:31:20 -0000	1.260.2.12
@@ -5913,7 +5913,7 @@
 				request->req_scope_level++;
 				context = pass1_alias(request, context->ctx_childs_derived_table, (dsql_str*) *arg);
 			}
-			else
+			else if (context->ctx_relation)
 			{
 				// This must be a VIEW
 				dsql_nod** startArg = arg;
@@ -5966,6 +5966,10 @@
 					context = NULL;				
 				}				
 			}
+			else 
+			{
+				context = NULL;				
+			}				
 		}
 		else
 		{