← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.cc

  • Committer: devananda
  • Date: 2009-06-30 14:27:54 UTC
  • mfrom: (1030.2.4 trunk)
  • mto: (1093.1.7 captain)
  • mto: This revision was merged to the branch mainline in revision 1095.
  • Revision ID: devananda.vdv@gmail.com-20090630142754-vm9w374yxkf1pikc
merge from lp

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
58
58
{
59
59
  CreateField *field_arg;
60
60
  List_iterator<CreateField> it(create_fields);
61
 
  drizzled::message::Table::StorageEngine *engine= table_proto->mutable_engine();
62
61
  drizzled::message::Table::TableOptions *table_options= table_proto->mutable_options();
63
62
 
64
63
  if (create_fields.elements > MAX_FIELDS)
67
66
    return(1);
68
67
  }
69
68
 
70
 
  engine->set_name(create_info->db_type->getName());
 
69
  assert(strcmp(table_proto->engine().name().c_str(),
 
70
                create_info->db_type->getName().c_str())==0);
71
71
 
72
72
  assert(strcmp(table_proto->name().c_str(),table_name)==0);
73
73
 
675
675
      return 1;
676
676
  }
677
677
 
678
 
  // Make sure mysql_create_frm din't remove extension
679
 
  if (session->variables.keep_files_on_create)
680
 
    create_info->options|= HA_CREATE_KEEP_FILES;
681
 
 
682
678
  if (ha_create_table(session, path, db, table_name,
683
679
                      create_info,0))
684
680
    goto err_handler;