[Firebird-checkins] CVS: firebird2/src/jrd evl.cpp,1.232,1.233

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

Build Version :  T2.1.0.16204 Firebird 2.1 Beta 1

(writeBuildNum.sh,v 1.16361 2007/07/31 13:06:15 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs17:/tmp/cvs-serv3137

Modified Files:
	evl.cpp 
Log Message:
Fixed CORE-1389.

Index: evl.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/evl.cpp,v
retrieving revision 1.232
retrieving revision 1.233
diff -b -U3 -r1.232 -r1.233
--- evl.cpp	31 Jul 2007 01:22:59 -0000	1.232
+++ evl.cpp	31 Jul 2007 13:06:11 -0000	1.233
@@ -1601,6 +1601,16 @@
 					if (request->req_flags & req_null) {
 						break;
 					}
+
+					// if a max or min has been mapped to an index,
+					// then the first record is the EOF
+
+					if (from->nod_type == nod_agg_max_indexed ||
+						from->nod_type == nod_agg_min_indexed)
+					{
+						state = 2;
+					}
+
 					++impure->vlux_count;
 					if (!impure->vlu_desc.dsc_dtype)
 					{
@@ -1627,13 +1637,6 @@
 						EVL_make_value(tdbb, desc, impure);
 					}
 
-					/* if a max or min has been mapped to an index, then the first record is the eof */
-
-					if (from->nod_type == nod_agg_max_indexed ||
-						from->nod_type == nod_agg_min_indexed)
-					{
-						state = 2;
-					}
 					break;
 				}
 
@@ -1730,6 +1733,9 @@
 			}
 		}
 
+		if (state == 2)
+			break;
+
 		if (!RSE_get_record(tdbb, rsb, g_RSE_get_mode))
 		{
 			  state = 2;