← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/float.cc

  • Committer: Mark Atwood
  • Date: 2011-12-20 02:32:53 UTC
  • mfrom: (2469.1.1 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111220023253-bvu0kr14kwsdvz7g
merge lp:~brianaker/drizzle/deprecate-pbms

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/float.cc
46
46
      break;
47
47
  }
48
48
  decimal_point= str;
49
 
  for (; my_isdigit(system_charset_info, *str) ; str++)
 
49
  for (; system_charset_info->isdigit(*str) ; str++)
50
50
    ;
51
51
  if (*str == 'e' || *str == 'E')
52
52
    return NOT_FIXED_DEC;
158
158
  char buf[64];
159
159
  String tmp(buf, sizeof(buf), &my_charset_bin);
160
160
  String* s= val_str(&tmp);
161
 
  Item_string* conv= new Item_static_string_func(func_name, s->ptr(), s->length(), s->charset());
 
161
  Item_string* conv= new Item_static_string_func(func_name, *s, s->charset());
162
162
  conv->str_value.copy();
163
163
  conv->str_value.mark_as_const();
164
164
  return conv;