← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/str.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/str.cc
39
39
                     unsigned char *null_ptr_arg,
40
40
                     unsigned char null_bit_arg,
41
41
                     const char *field_name_arg,
42
 
                     const CHARSET_INFO * const charset_arg)
 
42
                     const charset_info_st * const charset_arg)
43
43
  :Field(ptr_arg, len_arg,
44
44
         null_ptr_arg,
45
45
         null_bit_arg,
154
154
                             const char *well_formed_error_pos,
155
155
                             const char *cannot_convert_error_pos,
156
156
                             const char *end,
157
 
                             const CHARSET_INFO * const cs)
 
157
                             const charset_info_st * const cs)
158
158
{
159
159
  const char *pos, *end_orig;
160
160
  char tmp[64], *t;