← Back to branch summary

~skinny.moey/drizzle/gearman_replicator

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2010-03-24 19:36:31 UTC
  • Revision ID: brian@gaz-20100324193631-etehi1027i616mix
Simple rename.

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::EnumeratorValues field_options= pfield.enumerator_values();
 
515
        message::Table::Field::EnumerationValues field_options= pfield.enumeration_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::EnumeratorValues field_options= pfield.enumerator_values();
 
617
    message::Table::Field::EnumerationValues field_options= pfield.enumeration_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::EnumeratorValues field_options= pfield.enumerator_values();
 
764
      message::Table::Field::EnumerationValues field_options= pfield.enumeration_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::EnumeratorValues fo= pfield.enumerator_values();
 
876
      message::Table::Field::EnumerationValues fo= pfield.enumeration_values();
877
877
 
878
878
      for (int valnr= 0; valnr < fo.field_value_size(); valnr++)
879
879
      {