← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/key.cc

  • Committer: Brian Aker
  • Date: 2011-03-28 02:46:21 UTC
  • Revision ID: brian@tangent.org-20110328024621-wtkdtlvdplqm0ybf
Shift CHARSET_INFO to charset_info_st

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/key.cc
134
134
    {
135
135
      length= min((uint16_t)key_length, key_part->length);
136
136
      Field *field= key_part->field;
137
 
      const CHARSET_INFO * const cs= field->charset();
 
137
      const charset_info_st * const cs= field->charset();
138
138
      uint32_t bytes= field->get_key_image(to_key, length);
139
139
      if (bytes < length)
140
140
        cs->cset->fill(cs, (char*) to_key + bytes, length - bytes, ' ');
296
296
    length= min((uint32_t) (key_end-key), store_length);
297
297
    if (key_part->field->type() == DRIZZLE_TYPE_VARCHAR)
298
298
    {
299
 
      const CHARSET_INFO * const cs= key_part->field->charset();
 
299
      const charset_info_st * const cs= key_part->field->charset();
300
300
      uint32_t char_length= key_part->length / cs->mbmaxlen;
301
301
      const unsigned char *pos= table->getInsertRecord() + key_part->offset;
302
302
      if (length > char_length)
354
354
    }
355
355
    if ((field= key_part->field))
356
356
    {
357
 
      const CHARSET_INFO * const cs= field->charset();
 
357
      const charset_info_st * const cs= field->charset();
358
358
      field->setReadSet();
359
359
      field->val_str_internal(&tmp);
360
360
      if (cs->mbmaxlen > 1 &&