← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_index.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/drop_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)
65
65
  create_info.db_type= 0;
66
66
 
67
67
  bool res;
68
 
  if (original_table_message.type() == message::Table::STANDARD )
 
68
  if (original_table_message->type() == message::Table::STANDARD )
69
69
  {
70
70
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
71
71
 
75
75
                     identifier,
76
76
                     identifier,
77
77
                     &create_info, 
78
 
                     original_table_message,
 
78
                     *original_table_message,
79
79
                     create_table_proto, 
80
80
                     first_table,
81
81
                     &alter_info,
94
94
                       identifier,
95
95
                       identifier,
96
96
                       &create_info, 
97
 
                       original_table_message,
 
97
                       *original_table_message,
98
98
                       create_table_proto, 
99
99
                       first_table,
100
100
                       &alter_info,