← 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-11-10 05:50:26 UTC
  • mfrom: (1910.2.15 merge)
  • mto: This revision was merged to the branch mainline in revision 1922.
  • Revision ID: brian@tangent.org-20101110055026-shjlsd5jeumje2vt
Merge in tree for shared_ptr work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
107
107
  assert(select_lex->db);
108
108
 
109
109
  /* Chicken/Egg... we need to search for the table, to know if the table exists, so we can build a full identifier from it */
110
 
  message::Table original_table_message;
 
110
  message::TablePtr original_table_message;
111
111
  {
112
112
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
113
113
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
119
119
    if (not  create_info.db_type)
120
120
    {
121
121
      create_info.db_type= 
122
 
        plugin::StorageEngine::findByName(*session, original_table_message.engine().name());
 
122
        plugin::StorageEngine::findByName(*session, original_table_message->engine().name());
123
123
 
124
124
      if (not create_info.db_type)
125
125
      {
146
146
  }
147
147
 
148
148
  bool res;
149
 
  if (original_table_message.type() == message::Table::STANDARD )
 
149
  if (original_table_message->type() == message::Table::STANDARD )
150
150
  {
151
151
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
152
152
    TableIdentifier new_identifier(select_lex->db ? select_lex->db : first_table->getSchemaName(),
156
156
                     identifier,
157
157
                     new_identifier,
158
158
                     &create_info,
159
 
                     original_table_message,
 
159
                     *original_table_message,
160
160
                     create_table_message,
161
161
                     first_table,
162
162
                     &alter_info,
179
179
                       identifier,
180
180
                       new_identifier,
181
181
                       &create_info,
182
 
                       original_table_message,
 
182
                       *original_table_message,
183
183
                       create_table_message,
184
184
                       first_table,
185
185
                       &alter_info,