← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.cc

  • Committer: Mark Atwood
  • Date: 2011-10-25 19:08:35 UTC
  • mfrom: (2445.1.6 rf)
  • Revision ID: me@mark.atwood.name-20111025190835-g21cn911ypxjd5fi
merge lp:~olafvdspek/drizzle/refactor7

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/varstring.cc
262
262
    length-= length_bytes;
263
263
  }
264
264
 
265
 
  tot_length= my_strnxfrm(field_charset,
266
 
                          to, length, ptr + length_bytes,
267
 
                          tot_length);
 
265
  tot_length= field_charset->strnxfrm(to, length, ptr + length_bytes, tot_length);
268
266
  assert(tot_length == length);
269
267
}
270
268