← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Brian Aker
  • Date: 2011-02-03 20:32:09 UTC
  • mfrom: (2139.1.4 drizzle-build)
  • Revision ID: brian@tangent.org-20110203203209-r1t4knmy15x5n1w2
Rollup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
827
827
             unsigned char *null_ptr_arg,
828
828
             unsigned char null_bit_arg,
829
829
             utype unireg_check_arg, 
830
 
             const char *field_name_arg)
831
 
  :
 
830
             const char *field_name_arg) :
832
831
    ptr(ptr_arg),
833
832
    null_ptr(null_ptr_arg),
834
833
    table(NULL),
835
834
    orig_table(NULL),
836
835
    field_name(field_name_arg),
 
836
    comment(NULL_LEX_STRING),
837
837
    key_start(0),
838
838
    part_of_key(0),
839
839
    part_of_key_not_clustered(0),
840
840
    part_of_sortkey(0),
841
841
    unireg_check(unireg_check_arg),
842
842
    field_length(length_arg),
 
843
    flags(null_ptr ? 0: NOT_NULL_FLAG),
 
844
    field_index(0),
843
845
    null_bit(null_bit_arg),
844
846
    is_created_from_null_item(false)
845
847
{
846
 
  flags= null_ptr ? 0: NOT_NULL_FLAG;
847
 
  comment.str= (char*) "";
848
 
  comment.length= 0;
849
 
  field_index= 0;
850
848
}
851
849
 
852
850
void Field::hash(uint32_t *nr, uint32_t *nr2)
999
997
  {
1000
998
    copy->blob_field=(Field_blob*) this;
1001
999
    copy->strip=0;
1002
 
    copy->length-= table->getShare()->blob_ptr_size;
 
1000
    copy->length-= table->getShare()->sizeBlobPtr();
1003
1001
    return copy->length;
1004
1002
  }
1005
1003
  else