← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Mark Atwood
  • Date: 2011-10-21 14:25:19 UTC
  • mfrom: (2440.2.28 rf)
  • Revision ID: me@mark.atwood.name-20111021142519-bqnyqrkthibv70rc
Tags: 2011.10.28
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
4112
4112
      the true length of the key */
4113
4113
 
4114
4114
      if (len > 0 && cs->mbmaxlen > 1) {
4115
 
        true_len = (ulint) cs->cset->well_formed_len(cs,
4116
 
            (const char *) data,
4117
 
            (const char *) data + len,
4118
 
                                                (uint) (key_len /
4119
 
                                                        cs->mbmaxlen),
4120
 
            &error);
 
4115
        true_len = (ulint) cs->cset->well_formed_len(*cs, str_ref(data, len), (uint) (key_len / cs->mbmaxlen), &error);
4121
4116
      }
4122
4117
 
4123
4118
      /* In a column prefix index, we may need to truncate
4178
4173
      the true length of the key */
4179
4174
 
4180
4175
      if (blob_len > 0 && cs->mbmaxlen > 1) {
4181
 
        true_len = (ulint) cs->cset->well_formed_len(cs,
4182
 
                                                     (const char *) blob_data,
4183
 
                                                     (const char *) blob_data
4184
 
                                                     + blob_len,
4185
 
                                                     (uint) (key_len /
4186
 
                                                             cs->mbmaxlen),
4187
 
                                                     &error);
 
4176
        true_len = (ulint) cs->cset->well_formed_len(*cs, str_ref(blob_data, blob_len), (uint) (key_len / cs->mbmaxlen), &error);
4188
4177
      }
4189
4178
 
4190
4179
      /* All indexes on BLOB and TEXT are column prefix