← 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-10-15 05:30:39 UTC
  • mfrom: (1843.8.7 trunk-drizzle)
  • Revision ID: brian@tangent.org-20101015053039-ebmv3hnn1yaq4wqy
Merge in refactoring on table (broken it up by type, this will allow me to
insert the new locking).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
96
96
 
97
97
    message::Table::Field::FieldType parser_type= attribute->type();
98
98
 
99
 
    if (field_arg->sql_type == DRIZZLE_TYPE_NULL)
100
 
    {
101
 
      my_error(ER_CANT_CREATE_TABLE, MYF(ME_BELL+ME_WAITTANG), table_proto.name().c_str(), -1);
102
 
      return -1;
103
 
    }
104
 
 
105
99
    attribute->set_type(message::internalFieldTypeToFieldProtoType(field_arg->sql_type));
106
100
 
107
101
    switch (attribute->type()) {
543
537
*/
544
538
 
545
539
bool rea_create_table(Session *session,
546
 
                      const TableIdentifier &identifier,
 
540
                      TableIdentifier &identifier,
547
541
                      message::Table &table_proto,
548
542
                      HA_CREATE_INFO *create_info,
549
543
                      List<CreateField> &create_fields,