← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
721
721
  }
722
722
 
723
723
  if (error > 0)
 
724
  {
724
725
    make_truncated_value_warning(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
725
726
                                 str->ptr(), str->length(),
726
727
                                 warn_type, warn_name);
 
728
  }
727
729
 
728
730
  return value;
729
731
}
5099
5101
  while ((item_field= it++))
5100
5102
  {
5101
5103
    /* Skip fields of non-const tables. They haven't been read yet */
5102
 
    if (item_field->field->table->const_table)
 
5104
    if (item_field->field->getTable()->const_table)
5103
5105
    {
5104
5106
      if ((null_value= item_field->null_value) || eval_item->cmp(item_field))
5105
5107
        return 0;