firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:43:02 +01:00
Code Issues

Misc things seen by Claudio

Browse Source
This commit is contained in:
asfernandes 2010-09-25 20:26:05 +00:00
parent 1f8342a3a1
commit 746c032c90
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dsql/BoolNodes.cpp
View File

@ -256,7 +256,7 @@ bool BinaryBoolNode::executeAnd(thread_db* tdbb, jrd_req* request) const
const USHORT secondnull = request->req_flags & req_null;
request->req_flags &= ~req_null;
if ((!value1 && !firstnull) || (!value2 && !secondnull))
if (!value2 && !secondnull)
return false; // at least one operand was false
if (value1 && value2)
@ -284,10 +284,6 @@ bool BinaryBoolNode::executeOr(thread_db* tdbb, jrd_req* request) const
// N F N
// N T T
// N N N
//
// Also, preserve first operand's value and null state, but still
// evaluate second operand, since latter field mappings may
// depend on the evaluation.
const bool value1 = arg1->execute(tdbb, request);