← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/key.cc

Merge Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/key.cc
287
287
      continue;
288
288
    }
289
289
    length= min((uint32_t) (key_end-key), store_length);
290
 
    if (!(key_part->key_type & (FIELDFLAG_NUMBER+FIELDFLAG_BINARY+
291
 
                                FIELDFLAG_PACK)))
 
290
    if (key_part->field->type() == DRIZZLE_TYPE_VARCHAR)
292
291
    {
293
292
      const CHARSET_INFO * const cs= key_part->field->charset();
294
293
      uint32_t char_length= key_part->length / cs->mbmaxlen;