← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/my_decimal.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/my_decimal.cc
185
185
  if (charset->mbminlen > 1)
186
186
  {
187
187
    uint dummy_errors;
188
 
    tmp.copy(from, length, charset, &my_charset_latin1, &dummy_errors);
 
188
    tmp.copy(from, length, charset, &my_charset_utf8_general_ci, &dummy_errors);
189
189
    from= tmp.ptr();
190
190
    length=  tmp.length();
191
191
    charset= &my_charset_bin;
197
197
    /* Give warning if there is something other than end space */
198
198
    for ( ; end < from_end; end++)
199
199
    {
200
 
      if (!my_isspace(&my_charset_latin1, *end))
 
200
      if (!my_isspace(&my_charset_utf8_general_ci, *end))
201
201
      {
202
202
        err= E_DEC_TRUNCATED;
203
203
        break;