← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

  • Committer: Brian Aker
  • Date: 2010-12-16 04:01:22 UTC
  • mfrom: (1996.2.1 compare)
  • Revision ID: brian@tangent.org-20101216040122-eodh5shwsij35ybe
Merge in uuid tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
2231
2231
 
2232
2232
  if (!args[0]->null_value)
2233
2233
  {
2234
 
    result_field->val_str(&tmp_value);
 
2234
    result_field->val_str_internal(&tmp_value);
2235
2235
 
2236
2236
    if (result_field->is_null() ||
2237
2237
        (cmp_sign * sortcmp(res_str,&tmp_value,collation.collation)) < 0)
2913
2913
      uint32_t offset= (field->offset(field->getTable()->record[0]) -
2914
2914
                    table->getShare()->null_bytes);
2915
2915
      assert(offset < table->getShare()->getRecordLength());
2916
 
      res= field->val_str(&tmp, key + offset);
 
2916
      res= field->val_str_internal(&tmp, key + offset);
2917
2917
    }
2918
2918
    else
2919
2919
      res= (*arg)->val_str(&tmp);