← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.cc

  • Committer: Monty Taylor
  • Date: 2008-09-13 20:24:20 UTC
  • mfrom: (383.1.35 drizzle)
  • Revision ID: monty@inaugust.com-20080913202420-lkj76ewbabl8ljvp
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.cc
109
109
  if (decimals >= NOT_FIXED_DEC)
110
110
  {
111
111
    len= my_gcvt(num, MY_GCVT_ARG_DOUBLE, sizeof(buff) - 1, buff, NULL);
112
 
    return copy(buff, len, &my_charset_latin1, cs, &dummy_errors);
 
112
    return copy(buff, len, &my_charset_utf8_general_ci, cs, &dummy_errors);
113
113
  }
114
114
  len= my_fcvt(num, decimals, buff, NULL);
115
 
  return copy(buff, (uint32_t) len, &my_charset_latin1, cs,
 
115
  return copy(buff, (uint32_t) len, &my_charset_utf8_general_ci, cs,
116
116
              &dummy_errors);
117
117
}
118
118
 
308
308
    return 0;
309
309
  }
310
310
  uint dummy_errors;
311
 
  return copy(str, arg_length, &my_charset_latin1, str_charset, &dummy_errors);
 
311
  return copy(str, arg_length, &my_charset_utf8_general_ci, str_charset, &dummy_errors);
312
312
}
313
313
 
314
314
 
360
360
    if (realloc(str_length+ add_length))
361
361
      return true;
362
362
    str_length+= copy_and_convert(Ptr+str_length, add_length, str_charset,
363
 
                                  s, arg_length, &my_charset_latin1,
 
363
                                  s, arg_length, &my_charset_utf8_general_ci,
364
364
                                  &dummy_errors);
365
365
    return false;
366
366
  }