[Firebird-checkins] CVS: firebird2/src/jrd cmp.cpp,1.201,1.202 exe.h,1.81,1.82

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

Build Version :  T2.0.0.12538 Firebird 2.0 Release Candidate 1

(writeBuildNum.sh,v 1.12692 2006/03/29 17:47:39 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26841

Modified Files:
	cmp.cpp exe.h 
Log Message:
Fixed yet another bug in cursors. Will this ever end? :-)

Index: cmp.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/cmp.cpp,v
retrieving revision 1.201
retrieving revision 1.202
diff -b -U3 -r1.201 -r1.202
--- cmp.cpp	10 Mar 2006 17:46:18 -0000	1.201
+++ cmp.cpp	29 Mar 2006 17:47:36 -0000	1.202
@@ -3427,15 +3427,6 @@
 	case nod_rse:
 		return (jrd_nod*) pass1_rse(tdbb, csb, (RecordSelExpr*) node, view, view_stream);
 
-	case nod_dcl_cursor:
-		node->nod_arg[e_dcl_cursor_rse] =
-			pass1(tdbb, csb, node->nod_arg[e_dcl_cursor_rse], view, view_stream,
-				  validate_expr);
-		node->nod_arg[e_dcl_cursor_refs] =
-			pass1(tdbb, csb, node->nod_arg[e_dcl_cursor_refs], view, view_stream,
-				  validate_expr);
-		break;
-
 	case nod_cursor_stmt:
 		if ((UCHAR) (IPTR) node->nod_arg[e_cursor_stmt_op] == blr_cursor_fetch) {
 			node->nod_arg[e_cursor_stmt_seek] =
@@ -4583,7 +4574,6 @@
 #ifdef SCROLLABLE_CURSORS
 		csb->csb_current_rse = rse_node;
 #endif
-		pass2(tdbb, csb, node->nod_arg[e_dcl_cursor_refs], node);
 		break;
 
 	case nod_cursor_stmt:

Index: exe.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/exe.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -b -U3 -r1.81 -r1.82
--- exe.h	28 Mar 2006 09:36:22 -0000	1.81
+++ exe.h	29 Mar 2006 17:47:37 -0000	1.82
@@ -447,10 +447,10 @@
 const int e_current_time_length		= 1;
 const int e_current_timestamp_length= 1;
 
-const int e_dcl_cursor_number	= 0;
-const int e_dcl_cursor_rse		= 1;
-const int e_dcl_cursor_rsb		= 2;
-const int e_dcl_cursor_refs		= 3;
+const int e_dcl_cursor_rse		= 0;
+const int e_dcl_cursor_refs		= 1;
+const int e_dcl_cursor_number	= 2;
+const int e_dcl_cursor_rsb		= 3;
 const int e_dcl_cursor_length	= 4;
 
 const int e_cursor_stmt_op		= 0;