From: Claudio V. C. <ro...@us...> - 2010-04-29 05:13:12
|
Build Version : T3.0.0.28353 Firebird 3.0 Unstable (writeBuildNum.sh,v 1.28528 2010/04/29 05:13:04 robocop Exp ) Update of /cvsroot/firebird/firebird2/src/jrd In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30411/src/jrd Modified Files: dyn_def.epp JrdStatement.cpp opt.cpp Routine.h Log Message: Misc. Index: dyn_def.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/dyn_def.epp,v retrieving revision 1.210 retrieving revision 1.211 diff -b -U3 -r1.210 -r1.211 --- dyn_def.epp 19 Apr 2010 22:49:18 -0000 1.210 +++ dyn_def.epp 29 Apr 2010 05:13:02 -0000 1.211 @@ -1748,7 +1748,7 @@ id = old_id; - // The previous 2 lines and the next two lines can be + // The previous line and the next line can be // deleted as long as no code is added in the middle. old_id = id; Index: JrdStatement.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/JrdStatement.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -b -U3 -r1.1 -r1.2 --- JrdStatement.cpp 18 Apr 2010 22:19:06 -0000 1.1 +++ JrdStatement.cpp 29 Apr 2010 05:13:02 -0000 1.2 @@ -149,7 +149,7 @@ for (record_param* rpb = rpbsSetup.begin(); tail < streams_end; ++rpb, ++tail) { // fetch input stream for update if all booleans matched against indices - if (tail->csb_flags & csb_update && !(tail->csb_flags & csb_unmatched)) + if ((tail->csb_flags & csb_update) && !(tail->csb_flags & csb_unmatched)) rpb->rpb_stream_flags |= RPB_s_update; // if no fields are referenced and this stream is not intended for update, @@ -263,7 +263,7 @@ if (procedure) return procedure; - else + return function; } Index: opt.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/opt.cpp,v retrieving revision 1.423 retrieving revision 1.424 diff -b -U3 -r1.423 -r1.424 --- opt.cpp 18 Apr 2010 22:19:06 -0000 1.423 +++ opt.cpp 29 Apr 2010 05:13:02 -0000 1.424 @@ -752,8 +752,9 @@ UCharBuffer infoBuffer; - for (size_t i = 0; i < request->getStatement()->fors.getCount(); i++) - request->getStatement()->fors[i]->dump(tdbb, infoBuffer); + Firebird::Array<RecordSource*>& fors = request->getStatement()->fors; + for (size_t i = 0; i < fors.getCount(); i++) + fors[i]->dump(tdbb, infoBuffer); const size_t length = infoBuffer.getCount(); Index: Routine.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/Routine.h,v retrieving revision 1.5 retrieving revision 1.6 diff -b -U3 -r1.5 -r1.6 |