← 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: 2009-11-19 18:26:26 UTC
  • mto: (1223.1.4 push) (1226.1.2 push)
  • mto: This revision was merged to the branch mainline in revision 1224.
  • Revision ID: brian@gaz-20091119182626-5w98h5vnf1819sco
Fix engines to not rely on HA_CREATE_INFO.

There were a number of test cases where Innodb was accepting the wrong
ROW_FORMAT and just tossing warnings. It would cause the DFE to then be
different then the actual table definition.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
823
823
  }
824
824
 
825
825
  if (create_info->row_type == ROW_TYPE_NOT_USED)
 
826
  {
 
827
    message::Table::TableOptions *table_options;
 
828
    table_options= create_proto->mutable_options();
 
829
 
826
830
    create_info->row_type= table->s->row_type;
 
831
    table_options->set_row_type((drizzled::message::Table_TableOptions_RowType)table->s->row_type);
 
832
  }
827
833
 
828
834
  if (old_db_type->check_flag(HTON_BIT_ALTER_NOT_SUPPORTED) ||
829
835
      new_db_type->check_flag(HTON_BIT_ALTER_NOT_SUPPORTED))