← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.cc

  • Committer: Brian Aker
  • Date: 2011-03-28 02:46:21 UTC
  • Revision ID: brian@tangent.org-20110328024621-wtkdtlvdplqm0ybf
Shift CHARSET_INFO to charset_info_st

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.cc
26
26
namespace drizzled
27
27
{
28
28
 
29
 
Item *Item_string::safe_charset_converter(const CHARSET_INFO * const tocs)
 
29
Item *Item_string::safe_charset_converter(const charset_info_st * const tocs)
30
30
{
31
31
  Item_string *conv;
32
32
  size_t conv_errors;
56
56
}
57
57
 
58
58
 
59
 
Item *Item_static_string_func::safe_charset_converter(const CHARSET_INFO * const tocs)
 
59
Item *Item_static_string_func::safe_charset_converter(const charset_info_st * const tocs)
60
60
{
61
61
  Item_string *conv;
62
62
  size_t conv_errors;
116
116
  int error;
117
117
  char *end, *org_end;
118
118
  double tmp;
119
 
  const CHARSET_INFO * const cs= str_value.charset();
 
119
  const charset_info_st * const cs= str_value.charset();
120
120
 
121
121
  org_end= (char*) str_value.ptr() + str_value.length();
122
122
  tmp= my_strntod(cs, (char*) str_value.ptr(), str_value.length(), &end,
146
146
  int64_t tmp;
147
147
  char *end= (char*) str_value.ptr()+ str_value.length();
148
148
  char *org_end= end;
149
 
  const CHARSET_INFO * const cs= str_value.charset();
 
149
  const charset_info_st * const cs= str_value.charset();
150
150
 
151
151
  tmp= (*(cs->cset->strtoll10))(cs, str_value.ptr(), &end, &err);
152
152
  /*