← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_table.cc

  • Committer: Brian Aker
  • Date: 2009-11-18 06:24:48 UTC
  • mfrom: (1220.1.15 staging)
  • Revision ID: brian@gaz-20091118062448-o36lo3yv81sc6u9z
Merge Brian + Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_table.cc
58
58
  }
59
59
 
60
60
 
61
 
 
62
61
  /* 
63
62
    Now we set the name in our Table proto so that it will match 
64
63
    create_info.db_type.
136
135
      {
137
136
        TableList *duplicate= NULL;
138
137
        create_table= session->lex->unlink_first_table(&link_to_local);
139
 
        if ((duplicate= unique_table(session, create_table, select_tables, 0)))
 
138
        if ((duplicate= unique_table(create_table, select_tables)))
140
139
        {
141
140
          my_error(ER_UPDATE_TABLE_USED, MYF(0), create_table->alias);
142
141
          /*
189
188
    }
190
189
    else
191
190
    {
 
191
 
 
192
      for (int32_t x= 0; x < alter_info.alter_proto.added_field_size(); x++)
 
193
      {
 
194
        message::Table::Field *field= create_table_proto.add_field();
 
195
 
 
196
        *field= alter_info.alter_proto.added_field(x);
 
197
      }
 
198
 
192
199
      res= mysql_create_table(session, 
193
200
                              create_table->db,
194
201
                              create_table->table_name,