← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

  • Committer: Lee Bieber
  • Date: 2011-02-23 17:17:54 UTC
  • mfrom: (2194.1.3 build)
  • Revision ID: kalebral@gmail.com-20110223171754-5g62btbvgtzsev3n
Merge Stewart - 676770: Error log logging 'Sort aborted' messages when DML fails with ER_INVALID_ENUM_VALUE     
Merge Olaf - Use Item_equal::begin() and Use List::size()
Merge Olaf - Delete drizzled/strfunc.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
3962
3962
    if (item->maybe_null)
3963
3963
      maybe_null=1;
3964
3964
  }
3965
 
  session->getLex()->current_select->cond_count+= list.elements;
 
3965
  session->getLex()->current_select->cond_count+= list.size();
3966
3966
  session->session_marker= orig_session_marker;
3967
3967
  fix_length_and_dec();
3968
3968
  fixed= 1;
4962
4962
 
4963
4963
uint32_t Item_equal::members()
4964
4964
{
4965
 
  return fields.elements;
 
4965
  return fields.size();
4966
4966
}
4967
4967
 
4968
4968