← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message/table_writer.cc

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message/table_writer.cc
107
107
  message::Table::Field::FieldConstraints *field_constraints;
108
108
  message::Table::Field::StringFieldOptions *string_field_options;
109
109
  message::Table::Field::NumericFieldOptions *numeric_field_options;
110
 
  message::Table::Field::SetFieldOptions *set_field_options;
 
110
  message::Table::Field::EnumerationValues *enumeration_options;
111
111
 
112
112
  table->set_name(name);
113
113
  table->set_type(message::Table::STANDARD);
147
147
    field->set_type(message::Table::Field::ENUM);
148
148
    field->set_name("colors");
149
149
 
150
 
    set_field_options= field->mutable_set_options();
151
 
    set_field_options->add_field_value("red");
152
 
    set_field_options->add_field_value("blue");
153
 
    set_field_options->add_field_value("green");
 
150
    enumeration_options= field->mutable_enumeration_values();
 
151
    enumeration_options->add_field_value("red");
 
152
    enumeration_options->add_field_value("blue");
 
153
    enumeration_options->add_field_value("green");
154
154
  }
155
155
  /* Write out a BLOB */
156
156
  {