← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Monty Taylor
  • Date: 2009-05-09 22:26:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1009.
  • Revision ID: mordred@inaugust.com-20090509222607-wjjid9t0x0dbgagp
Removed is_stored - was only used for VCOL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
580
580
    if(pfield.has_constraints() && pfield.constraints().is_nullable())
581
581
      null_fields++;
582
582
 
583
 
    bool field_is_stored= true;
584
 
 
585
583
    enum_field_types drizzle_field_type=
586
584
      proto_field_type_to_drizzle_type(pfield.type());
587
585
 
637
635
    }
638
636
 
639
637
    share->reclength+= field_pack_length[fieldnr];
 
638
    stored_columns_reclength+= field_pack_length[fieldnr];
640
639
 
641
 
    if(field_is_stored)
642
 
      stored_columns_reclength+= field_pack_length[fieldnr];
643
640
  }
644
641
 
645
642
  /* data_offset added to stored_rec_length later */
646
643
  share->stored_rec_length= stored_columns_reclength;
647
644
 
648
 
  /* fix up offsets for non-stored fields (at end of record) */
649
 
  for(unsigned int fieldnr=0; fieldnr < share->fields; fieldnr++)
650
 
  {
651
 
    drizzled::message::Table::Field pfield= table.field(fieldnr);
652
 
 
653
 
    bool field_is_stored= true;
654
 
 
655
 
    if(!field_is_stored)
656
 
    {
657
 
      field_offsets[fieldnr]= stored_columns_reclength;
658
 
      stored_columns_reclength+= field_pack_length[fieldnr];
659
 
    }
660
 
  }
661
645
  share->null_fields= null_fields;
662
646
 
663
647
  ulong null_bits= null_fields;
855
839
    }
856
840
 
857
841
    enum_field_types field_type;
858
 
    bool field_is_stored= true;
859
 
 
860
842
 
861
843
    field_type= proto_field_type_to_drizzle_type(pfield.type());
862
844
 
965
947
 
966
948
    f->field_index= fieldnr;
967
949
    f->comment= comment;
968
 
    f->is_stored= field_is_stored;
969
950
    if(!default_value
970
951
       && !(f->unireg_check==Field::NEXT_NUMBER)
971
952
       && (f->flags & NOT_NULL_FLAG)
982
963
      (void) my_hash_insert(&share->name_hash,
983
964
                            (unsigned char*)&(share->field[fieldnr]));
984
965
 
985
 
    if(!f->is_stored)
986
 
    {
987
 
      share->stored_fields--;
988
 
    }
989
966
  }
990
967
 
991
968
  keyinfo= share->key_info;