← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.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.cc
784
784
      Item_ref to allow fields from view being stored in tmp table.
785
785
    */
786
786
    Item_aggregate_ref *item_ref;
787
 
    uint32_t el= fields.elements;
 
787
    uint32_t el= fields.size();
788
788
    Item *real_itm= real_item();
789
789
 
790
790
    ref_pointer_array[el]= real_itm;