← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.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/field/varstring.cc
56
56
                                 unsigned char *null_ptr_arg,
57
57
                                 unsigned char null_bit_arg,
58
58
                                 const char *field_name_arg,
59
 
                                 const CHARSET_INFO * const cs) :
 
59
                                 const charset_info_st * const cs) :
60
60
  Field_str(ptr_arg,
61
61
            len_arg,
62
62
            null_ptr_arg,
69
69
Field_varstring::Field_varstring(uint32_t len_arg,
70
70
                                 bool maybe_null_arg,
71
71
                                 const char *field_name_arg,
72
 
                                 const CHARSET_INFO * const cs) :
 
72
                                 const charset_info_st * const cs) :
73
73
  Field_str((unsigned char*) 0,
74
74
            len_arg,
75
75
            maybe_null_arg ? (unsigned char*) "": 0,
80
80
{
81
81
}
82
82
 
83
 
int Field_varstring::store(const char *from,uint32_t length, const CHARSET_INFO * const cs)
 
83
int Field_varstring::store(const char *from,uint32_t length, const charset_info_st * const cs)
84
84
{
85
85
  uint32_t copy_length;
86
86
  const char *well_formed_error_pos;
283
283
 
284
284
void Field_varstring::sql_type(String &res) const
285
285
{
286
 
  const CHARSET_INFO * const cs=res.charset();
 
286
  const charset_info_st * const cs=res.charset();
287
287
  uint32_t length;
288
288
 
289
289
  length= cs->cset->snprintf(cs,(char*) res.ptr(),