[Firebird-checkins] CVS: vulcan/src/jrd opt.cpp,1.39,1.40

[Arno B. <arn...@us...>]

Build Version :  V2.0.0.4895 Vulcan 1.0 Development

(writeBuildNum.sh,v 1.1.1.868 2006/08/31 18:28:39 arnobrink )

Update of /cvsroot/firebird/vulcan/src/jrd
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6573

Modified Files:
	opt.cpp 
Log Message:
Fix bug CORE-897

Index: opt.cpp
===================================================================
RCS file: /cvsroot/firebird/vulcan/src/jrd/opt.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -b -U3 -r1.39 -r1.40
--- opt.cpp	25 Apr 2006 17:32:56 -0000	1.39
+++ opt.cpp	31 Aug 2006 18:28:39 -0000	1.40
@@ -869,10 +869,15 @@
 					}
 				else
 					{
-					// Deactivate streams so marked
 					if (free_streams[0]) 
-						for (i = 1; i <= sub_streams[0]; i++) 
-							csb->csb_rpt[sub_streams[i]].csb_flags &= ~csb_active;
+						{
+						// Deactivate streams from rivers on stack, because
+						// the remaining streams don't have any indexed relationship with them.
+						RiverStack::iterator stack1(rivers_stack);
+						
+						for (; stack1.hasData(); ++stack1) 
+							set_inactive(opt, stack1.object());
+						}
 
 					break;
 					}