← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/firebird2.5/oneiric-security

« back to all changes in this revision

Viewing changes to src/dsql/gen.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Damyan Ivanov
  • Date: 2010-07-27 18:12:34 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100727181234-88lvl2nuord9ysx5
Tags: 2.5.0.26054~ReleaseCandidate3.ds2-1
* New upstream release candidate

* update d/copyright to reflect changes in upstream sources
* drop patches applied/implemented upstream
  + refresh the rest to apply cleanly
* Standards-Version: 3.9.1 (no changes necessary)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dsql/gen.cpp
175
175
                // ASF: If we are not referencing a field, we should evaluate the expression based on
176
176
                // a set (ORed) of contexts. If any of them are in a valid position the expression is
177
177
                // evaluated, otherwise a NULL will be returned. This is fix for CORE-1246.
178
 
                if (node->nod_arg[e_derived_field_value]->nod_type != nod_field &&
 
178
                if (node->nod_arg[e_derived_field_value]->nod_type != nod_derived_field &&
 
179
                        node->nod_arg[e_derived_field_value]->nod_type != nod_field &&
179
180
                        node->nod_arg[e_derived_field_value]->nod_type != nod_dbkey &&
180
181
                        node->nod_arg[e_derived_field_value]->nod_type != nod_map)
181
182
                {