← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

  • Committer: Brian Aker
  • Date: 2010-11-10 20:56:34 UTC
  • mfrom: (1921.1.2 trunk)
  • Revision ID: brian@tangent.org-20101110205634-u5rt2i4ibpyj20wh
Rollup patch around using shared_ptr with Table messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_index.cc
34
34
  TableList *all_tables= session->lex->query_tables;
35
35
 
36
36
  /* Chicken/Egg... we need to search for the table, to know if the table exists, so we can build a full identifier from it */
37
 
  message::Table original_table_message;
 
37
  message::TablePtr original_table_message;
38
38
  {
39
39
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
40
40
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
60
60
  }
61
61
 
62
62
  bool res;
63
 
  if (original_table_message.type() == message::Table::STANDARD )
 
63
  if (original_table_message->type() == message::Table::STANDARD )
64
64
  {
65
65
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
66
66
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
69
69
                     identifier,
70
70
                     identifier,
71
71
                     &create_info, 
72
 
                     original_table_message,
 
72
                     *original_table_message,
73
73
                     create_table_message, 
74
74
                     first_table,
75
75
                     &alter_info,
88
88
                       identifier,
89
89
                       identifier,
90
90
                       &create_info, 
91
 
                       original_table_message,
 
91
                       *original_table_message,
92
92
                       create_table_message, 
93
93
                       first_table,
94
94
                       &alter_info,