← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.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:
drizzled/sql_string.cc
580
580
    }
581
581
 
582
582
    set_if_smaller(from_length, to_length);
583
 
    res= to_cs->cset->well_formed_len(to_cs, from, from + from_length,
584
 
                                      nchars, &well_formed_error);
 
583
    res= to_cs->cset->well_formed_len(*to_cs, str_ref(from, from_length), nchars, &well_formed_error);
585
584
    memmove(to, from, res);
586
585
    *from_end_pos= from + res;
587
586
    *well_formed_error_pos= well_formed_error ? from + res : NULL;