← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/type/decimal.cc

  • Committer: Mark Atwood
  • Date: 2011-05-09 02:53:31 UTC
  • mfrom: (2281.6.2 prune)
  • Revision ID: me@mark.atwood.name-20110509025331-7gc89m3031ipwwf8
merge lp:~olafvdspek/drizzle/prune2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/type/decimal.cc
290
290
  String tmp(buff, sizeof(buff), &my_charset_bin);
291
291
  if (charset->mbminlen > 1)
292
292
  {
293
 
    size_t dummy_errors;
294
 
    tmp.copy(from, length, charset, &my_charset_utf8_general_ci, &dummy_errors);
 
293
    tmp.copy(from, length, &my_charset_utf8_general_ci);
295
294
    from= tmp.ptr();
296
295
    length=  tmp.length();
297
296
    charset= &my_charset_bin;