← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/str.cc

Merge Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/str.cc
26
26
#include <drizzled/session.h>
27
27
 
28
28
 
29
 
Field_str::Field_str(unsigned char *ptr_arg,uint32_t len_arg,
 
29
Field_str::Field_str(unsigned char *ptr_arg,
 
30
                     uint32_t len_arg,
30
31
                     unsigned char *null_ptr_arg,
31
 
                     unsigned char null_bit_arg, utype unireg_check_arg,
 
32
                     unsigned char null_bit_arg,
32
33
                     const char *field_name_arg,
33
34
                     const CHARSET_INFO * const charset_arg)
34
 
  :Field(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
35
 
         unireg_check_arg, field_name_arg)
 
35
  :Field(ptr_arg, len_arg,
 
36
         null_ptr_arg,
 
37
         null_bit_arg,
 
38
         Field::NONE,
 
39
         field_name_arg)
36
40
{
37
41
  field_charset= charset_arg;
38
42
  if (charset_arg->state & MY_CS_BINSORT)
39
 
    flags|=BINARY_FLAG;
 
43
    flags|= BINARY_FLAG;
40
44
  field_derivation= DERIVATION_IMPLICIT;
41
45
}
42
46