← Back to branch summary

~stewart/drizzle/remove-unused-row-type-in-table-message

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

  • Committer: Stewart Smith
  • Date: 2010-07-20 16:35:49 UTC
  • mfrom: (1638.1.28 drizzle)
  • Revision ID: stewart@flamingspork.com-20100720163549-zgcsmroyt0njr92d
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
2817
2817
    */
2818
2818
    Field *field= item->get_tmp_table_field();
2819
2819
    int res;
2820
 
    uint32_t offset= field->offset(field->table->record[0])-table->getShare()->null_bytes;
 
2820
    uint32_t offset= field->offset(field->getTable()->record[0])-table->getShare()->null_bytes;
2821
2821
    if((res= field->cmp((unsigned char*)key1 + offset, (unsigned char*)key2 + offset)))
2822
2822
      return res;
2823
2823
  }
2854
2854
    if (field && !item->const_item())
2855
2855
    {
2856
2856
      int res;
2857
 
      uint32_t offset= (field->offset(field->table->record[0]) -
 
2857
      uint32_t offset= (field->offset(field->getTable()->record[0]) -
2858
2858
                    table->getShare()->null_bytes);
2859
2859
      if ((res= field->cmp((unsigned char*)key1 + offset, (unsigned char*)key2 + offset)))
2860
2860
        return (*order_item)->asc ? res : -res;
2904
2904
        because it contains both order and arg list fields.
2905
2905
      */
2906
2906
      Field *field= (*arg)->get_tmp_table_field();
2907
 
      uint32_t offset= (field->offset(field->table->record[0]) -
 
2907
      uint32_t offset= (field->offset(field->getTable()->record[0]) -
2908
2908
                    table->getShare()->null_bytes);
2909
2909
      assert(offset < table->getShare()->getRecordLength());
2910
2910
      res= field->val_str(&tmp, key + offset);