← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.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_proto_write.cc
148
148
      }
149
149
    case message::Table::Field::ENUM:
150
150
      {
151
 
        message::Table::Field::EnumeratorValues *enumerator_options;
 
151
        message::Table::Field::EnumerationValues *enumeration_options;
152
152
 
153
153
        assert(field_arg->interval);
154
154
 
155
 
        enumerator_options= attribute->mutable_enumerator_values();
 
155
        enumeration_options= attribute->mutable_enumeration_values();
156
156
 
157
157
        for (uint32_t pos= 0; pos < field_arg->interval->count; pos++)
158
158
        {
159
159
          const char *src= field_arg->interval->type_names[pos];
160
160
 
161
 
          enumerator_options->add_field_value(src);
 
161
          enumeration_options->add_field_value(src);
162
162
        }
163
 
        enumerator_options->set_collation_id(field_arg->charset->number);
164
 
        enumerator_options->set_collation(field_arg->charset->name);
 
163
        enumeration_options->set_collation_id(field_arg->charset->number);
 
164
        enumeration_options->set_collation(field_arg->charset->name);
165
165
        break;
166
166
      }
167
167
    case message::Table::Field::BLOB: