← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/key.cc

  • Committer: Mark Atwood
  • Date: 2011-07-13 22:28:29 UTC
  • mfrom: (2318.7.25 refactor1)
  • Revision ID: me@mark.atwood.name-20110713222829-sswp061b5ts7tc1k
merge lp:~olafvdspek/drizzle/refactor1

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/key.cc
369
369
          Align, returning not more than "char_length" characters.
370
370
        */
371
371
        uint32_t charpos, char_length= key_part->length / cs->mbmaxlen;
372
 
        if ((charpos= my_charpos(cs, tmp.c_ptr(),
373
 
                                 tmp.c_ptr() + tmp.length(),
374
 
                                 char_length)) < key_part->length)
 
372
        if ((charpos= my_charpos(cs, tmp.c_ptr(), tmp.c_ptr() + tmp.length(), char_length)) < key_part->length)
375
373
          tmp.length(charpos);
376
374
      }
377
375