← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/strfunc.cc

  • Committer: Patrick Crews
  • Date: 2010-12-07 20:02:50 UTC
  • Revision ID: gleebix@gmail.com-20101207200250-6a27jgqalgw5bsb5
Added disabled.def file to disable drizzleslap due to Bug#684269.  Need to skip for tarball release this round

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/strfunc.cc
53
53
}
54
54
 
55
55
 
56
 
type::Decimal *Item_str_func::val_decimal(type::Decimal *decimal_value)
 
56
my_decimal *Item_str_func::val_decimal(my_decimal *decimal_value)
57
57
{
58
58
  assert(fixed == 1);
59
59
  char buff[64];
60
60
  String *res, tmp(buff,sizeof(buff), &my_charset_bin);
61
61
  res= val_str(&tmp);
62
 
  if (not res)
 
62
  if (!res)
63
63
    return 0;
64
 
 
65
 
  (void)decimal_value->store(E_DEC_FATAL_ERROR, (char*) res->ptr(), res->length(), res->charset());
66
 
 
 
64
  (void)str2my_decimal(E_DEC_FATAL_ERROR, (char*) res->ptr(),
 
65
                       res->length(), res->charset(), decimal_value);
67
66
  return decimal_value;
68
67
}
69
68
 
84
83
{
85
84
  assert(fixed == 1);
86
85
  int err;
87
 
  char buff[DECIMAL_LONGLONG_DIGITS];
 
86
  char buff[22];
88
87
  String *res, tmp(buff,sizeof(buff), &my_charset_bin);
89
88
  res= val_str(&tmp);
90
89
  return (res ?
106
105
  }
107
106
}
108
107
 
109
 
DRIZZLED_API String my_empty_string("",default_charset_info);
 
108
String my_empty_string("",default_charset_info);
110
109
 
111
110
} /* namespace drizzled */