[Firebird-checkins] SF.net SVN: firebird:[52469] firebird/trunk/src/jrd/Optimizer.cpp

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

Revision: 52469
          http://firebird.svn.sourceforge.net/firebird/?rev=52469&view=rev
Author:   dimitr
Date:     2011-02-26 09:02:19 +0000 (Sat, 26 Feb 2011)

Log Message:
-----------
Fixed the regression I introduced recently. Temporary solution, to be reworked soon.

Modified Paths:
--------------
    firebird/trunk/src/jrd/Optimizer.cpp

Modified: firebird/trunk/src/jrd/Optimizer.cpp
===================================================================
--- firebird/trunk/src/jrd/Optimizer.cpp	2011-02-26 07:25:10 UTC (rev 52468)
+++ firebird/trunk/src/jrd/Optimizer.cpp	2011-02-26 09:02:19 UTC (rev 52469)
@@ -1635,6 +1635,9 @@
  * Functional description
  *
  **************************************/
+	if (boolean->nodFlags & ExprNode::FLAG_DEOPTIMIZE)
+		return false;
+
 	ComparativeBoolNode* cmpNode = boolean->as<ComparativeBoolNode>();
 	MissingBoolNode* missingNode = boolean->as<MissingBoolNode>();
 	NotBoolNode* notNode = boolean->as<NotBoolNode>();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.