From: Claudio V. C. <ro...@us...> - 2010-03-07 04:31:11
|
Build Version : T3.0.0.27844 Firebird 3.0 Unstable (writeBuildNum.sh,v 1.28018 2010/03/07 04:30:33 robocop Exp ) Update of /cvsroot/firebird/firebird2/src/jrd In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2949/src/jrd Modified Files: cmp.cpp ext.cpp Optimizer.cpp Log Message: Misc. Index: cmp.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/cmp.cpp,v retrieving revision 1.396 retrieving revision 1.397 diff -b -U3 -r1.396 -r1.397 --- cmp.cpp 28 Feb 2010 00:40:01 -0000 1.396 +++ cmp.cpp 7 Mar 2010 04:30:31 -0000 1.397 @@ -193,7 +193,7 @@ class SubExprNodeCopier : public NodeCopier { public: - SubExprNodeCopier(CompilerScratch* aCsb) + explicit SubExprNodeCopier(CompilerScratch* aCsb) : NodeCopier(aCsb, localMap) { // Initialize the map so all streams initially resolve to the original number. As soon Index: ext.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/ext.cpp,v retrieving revision 1.98 retrieving revision 1.99 diff -b -U3 -r1.98 -r1.99 --- ext.cpp 1 Mar 2010 02:14:31 -0000 1.98 +++ ext.cpp 7 Mar 2010 04:30:31 -0000 1.99 @@ -87,7 +87,7 @@ } public: - ExternalFileDirectoryList(const Database* dbb) + explicit ExternalFileDirectoryList(const Database* dbb) : DirectoryList(*dbb->dbb_permanent), config(dbb->dbb_config) { initialize(); Index: Optimizer.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/Optimizer.cpp,v retrieving revision 1.141 retrieving revision 1.142 diff -b -U3 -r1.141 -r1.142 --- Optimizer.cpp 26 Feb 2010 09:51:48 -0000 1.141 +++ Optimizer.cpp 7 Mar 2010 04:30:31 -0000 1.142 @@ -316,9 +316,6 @@ if (idx && idx->idx_expression_request && idx->idx_expression) { fb_assert(idx->idx_flags & idx_expressn); - - bool result = false; - return OPT_expression_equal2(tdbb, csb, idx->idx_expression, node, stream); } |