← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Brian Aker
  • Date: 2010-05-13 00:24:20 UTC
  • mto: This revision was merged to the branch mainline in revision 1533.
  • Revision ID: brian@gaz-20100513002420-rqxkrxegkwivaxmm
Merge engine options for schema/table.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
601
601
 
602
602
    if (not found)
603
603
    {
604
 
      message::Table::StorageEngine *engine_options;
605
 
      engine_options= table_message.mutable_engine();
606
 
      message::Table::StorageEngine::EngineOption *opt= engine_options->add_options();
 
604
      message::Engine::Option *opt= table_message.mutable_engine()->add_options();
607
605
 
608
606
      opt->set_name(original_proto.engine().options(x).name());
609
607
      opt->set_state(original_proto.engine().options(x).state());
1575
1573
  */
1576
1574
  create_proto.set_name(identifier.getTableName());
1577
1575
 
1578
 
  message::Table::StorageEngine *protoengine;
1579
 
  protoengine= create_proto.mutable_engine();
1580
 
  protoengine->set_name(create_info->db_type->getName());
 
1576
  create_proto.mutable_engine()->set_name(create_info->db_type->getName());
1581
1577
 
1582
1578
  error= mysql_create_table(session,
1583
1579
                            identifier,