← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/key.cc

  • Committer: Eric Day
  • Date: 2009-10-31 21:53:33 UTC
  • mfrom: (1200 staging)
  • mto: This revision was merged to the branch mainline in revision 1202.
  • Revision ID: eday@oddments.org-20091031215333-j94bjoanwmi68p6f
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/key.cc
212
212
    else if (key_part->key_part_flag & HA_VAR_LENGTH_PART)
213
213
    {
214
214
      Field *field= key_part->field;
215
 
      my_ptrdiff_t ptrdiff= to_record - field->table->record[0];
 
215
      ptrdiff_t ptrdiff= to_record - field->table->record[0];
216
216
 
217
217
      field->setReadSet();
218
218
      field->setWriteSet();
495
495
  uint32_t key_parts= key_info->key_parts, i= 0;
496
496
  KEY_PART_INFO *key_part= key_info->key_part;
497
497
  unsigned char *rec0= key_part->field->ptr - key_part->offset;
498
 
  my_ptrdiff_t first_diff= first_rec - rec0, sec_diff= second_rec - rec0;
 
498
  ptrdiff_t first_diff= first_rec - rec0, sec_diff= second_rec - rec0;
499
499
  int result= 0;
500
500
 
501
501
  do