← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2010-03-22 20:45:17 UTC
  • Revision ID: brian@gaz-20100322204517-6zpm8k2jw1ni5bx2
Change Set to Enum

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
512
512
      break;
513
513
    case DRIZZLE_TYPE_ENUM:
514
514
      {
515
 
        message::Table::Field::SetFieldOptions field_options= pfield.set_options();
 
515
        message::Table::Field::EnumeratorValues field_options= pfield.enumerator_values();
516
516
 
517
517
        field_pack_length[fieldnr]=
518
518
          get_enum_pack_length(field_options.field_value_size());
614
614
    if (pfield.type() != message::Table::Field::ENUM)
615
615
      continue;
616
616
 
617
 
    message::Table::Field::SetFieldOptions field_options= pfield.set_options();
 
617
    message::Table::Field::EnumeratorValues field_options= pfield.enumerator_values();
618
618
 
619
619
    const CHARSET_INFO *charset= get_charset(field_options.has_collation_id() ?
620
620
                                             field_options.collation_id() : 0);
761
761
 
762
762
    if (field_type == DRIZZLE_TYPE_ENUM)
763
763
    {
764
 
      message::Table::Field::SetFieldOptions field_options= pfield.set_options();
 
764
      message::Table::Field::EnumeratorValues field_options= pfield.enumerator_values();
765
765
 
766
766
      charset= get_charset(field_options.has_collation_id()?
767
767
                           field_options.collation_id() : 0);
873
873
    {
874
874
      field_length= 0;
875
875
 
876
 
      message::Table::Field::SetFieldOptions fo= pfield.set_options();
 
876
      message::Table::Field::EnumeratorValues fo= pfield.enumerator_values();
877
877
 
878
878
      for (int valnr= 0; valnr < fo.field_value_size(); valnr++)
879
879
      {
880
880
        if (fo.field_value(valnr).length() > field_length)
 
881
        {
881
882
          field_length= charset->cset->numchars(charset,
882
883
                                                fo.field_value(valnr).c_str(),
883
884
                                                fo.field_value(valnr).c_str()
884
885
                                                + fo.field_value(valnr).length())
885
886
            * charset->mbmaxlen;
 
887
        }
886
888
      }
887
889
    }
888
 
      break;
 
890
    break;
889
891
    case DRIZZLE_TYPE_LONG:
890
892
      {
891
893
        uint32_t sign_len= pfield.constraints().is_unsigned() ? 0 : 1;