← 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-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/type/decimal.cc
302
302
    /* Give warning if there is something other than end space */
303
303
    for ( ; end < from_end; end++)
304
304
    {
305
 
      if (!my_isspace(&my_charset_utf8_general_ci, *end))
 
305
      if (not my_charset_utf8_general_ci.isspace(*end))
306
306
      {
307
307
        err= E_DEC_TRUNCATED;
308
308
        break;
1028
1028
  sanity(to);
1029
1029
 
1030
1030
  error= E_DEC_BAD_NUM;                         /* In case of bad number */
1031
 
  while (s < end_of_string && my_isspace(&my_charset_utf8_general_ci, *s))
 
1031
  while (s < end_of_string && my_charset_utf8_general_ci.isspace(*s))
1032
1032
    s++;
1033
1033
  if (s == end_of_string)
1034
1034
    goto fatal_error;
1039
1039
    s++;
1040
1040
 
1041
1041
  s1=s;
1042
 
  while (s < end_of_string && my_isdigit(&my_charset_utf8_general_ci, *s))
 
1042
  while (s < end_of_string && my_charset_utf8_general_ci.isdigit(*s))
1043
1043
    s++;
1044
1044
  intg= (int) (s-s1);
1045
1045
  if (s < end_of_string && *s=='.')
1046
1046
  {
1047
1047
    endp= s+1;
1048
 
    while (endp < end_of_string && my_isdigit(&my_charset_utf8_general_ci, *endp))
 
1048
    while (endp < end_of_string && my_charset_utf8_general_ci.isdigit(*endp))
1049
1049
      endp++;
1050
1050
    frac= (int) (endp - s - 1);
1051
1051
  }