From 6d499910f98099a9e168fedaed03f796112a2f92 Mon Sep 17 00:00:00 2001
From: skidder <skidder@users.sourceforge.net>
Date: Sat, 12 Oct 2002 20:27:26 +0000
Subject: [PATCH] Move nulls first/last code out of SCROLLABLE_CURSORS ifdef

---
 src/jrd/opt.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jrd/opt.cpp b/src/jrd/opt.cpp
index ee9afcb9b4..34730b734d 100644
--- a/src/jrd/opt.cpp
+++ b/src/jrd/opt.cpp
@@ -29,7 +29,7 @@
  *             stored procedure doesn't access tables, views or other procedures directly.
  */
 /*
-$Id: opt.cpp,v 1.15 2002-10-12 19:46:29 skidder Exp $
+$Id: opt.cpp,v 1.16 2002-10-12 20:27:25 skidder Exp $
 */
 
 #include "firebird.h"
@@ -3352,14 +3352,14 @@ static RSB gen_navigation(TDBB tdbb,
 		if (node->nod_type != nod_field
 			|| (USHORT) node->nod_arg[e_fld_stream] != stream
 			|| (USHORT) node->nod_arg[e_fld_id] != idx_tail->idx_field
+			|| ptr[2*sort->nod_count] /* do not use index if NULLS FIRST is used */
 #ifdef SCROLLABLE_CURSORS
 			)
 #else
 			|| (ptr[sort->nod_count]
 				&& !(idx->idx_flags & idx_descending))
 			|| (!ptr[sort->nod_count]
-				&& (idx->idx_flags & idx_descending))
-			|| ptr[2*sort->nod_count] /* do not use index if NULLS FIRST is used */ )
+				&& (idx->idx_flags & idx_descending)) )
 #endif
 			return NULL;
 #ifdef SCROLLABLE_CURSORS