← 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: 2008-12-18 17:54:22 UTC
  • mfrom: (713.1.5 devel)
  • Revision ID: brian@tangent.org-20081218175422-zqfm3mpueuq7z2az
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/key.cc
314
314
        return 1;
315
315
      continue;
316
316
    }
317
 
    length= cmin((uint32_t) (key_end-key), store_length);
 
317
    length= cmin((uint) (key_end-key), store_length);
318
318
    if (!(key_part->key_type & (FIELDFLAG_NUMBER+FIELDFLAG_BINARY+
319
319
                                FIELDFLAG_PACK)))
320
320
    {
390
390
          Align, returning not more than "char_length" characters.
391
391
        */
392
392
        uint32_t charpos, char_length= key_part->length / cs->mbmaxlen;
393
 
        if ((charpos= my_charpos(cs, tmp.c_ptr(),
394
 
                                 tmp.c_ptr() + tmp.length(),
 
393
        if ((charpos= my_charpos(cs, tmp.ptr(),
 
394
                                 tmp.ptr() + tmp.length(),
395
395
                                 char_length)) < key_part->length)
396
396
          tmp.length(charpos);
397
397
      }