← 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-07-13 22:28:29 UTC
  • mfrom: (2318.7.25 refactor1)
  • Revision ID: me@mark.atwood.name-20110713222829-sswp061b5ts7tc1k
merge lp:~olafvdspek/drizzle/refactor1

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/float.cc
27
27
#include <drizzled/item/num.h>
28
28
#include <drizzled/item/string.h>
29
29
 
30
 
namespace drizzled
31
 
{
 
30
namespace drizzled {
32
31
 
33
32
extern const charset_info_st *system_charset_info;
34
33
 
154
153
  return false;
155
154
}
156
155
 
157
 
Item *Item_static_float_func::safe_charset_converter(const charset_info_st * const)
 
156
Item *Item_static_float_func::safe_charset_converter(const charset_info_st*)
158
157
{
159
 
  Item_string *conv;
160
158
  char buf[64];
161
 
  String *s, tmp(buf, sizeof(buf), &my_charset_bin);
162
 
  s= val_str(&tmp);
163
 
  conv= new Item_static_string_func(func_name, s->ptr(), s->length(), s->charset());
 
159
  String tmp(buf, sizeof(buf), &my_charset_bin);
 
160
  String* s= val_str(&tmp);
 
161
  Item_string* conv= new Item_static_string_func(func_name, s->ptr(), s->length(), s->charset());
164
162
  conv->str_value.copy();
165
163
  conv->str_value.mark_as_const();
166
164
  return conv;