← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-02-10 16:26:01 UTC
  • mto: This revision was merged to the branch mainline in revision 1294.
  • Revision ID: osullivan.padraig@gmail.com-20100210162601-itx2ndl397pc1wr6
Corrected an order of initialization in a few optimizer classes

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_index.cc
32
32
{
33
33
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
34
34
  TableList *all_tables= session->lex->query_tables;
35
 
 
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::shared_ptr original_table_message;
38
 
  {
39
 
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
40
 
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
41
 
    {
42
 
      std::string path;
43
 
      identifier.getSQLPath(path);
44
 
      my_error(ER_BAD_TABLE_ERROR, MYF(0), path.c_str());
45
 
      return true;
46
 
    }
47
 
  }
48
 
 
49
35
  /*
50
36
    CREATE INDEX and DROP INDEX are implemented by calling ALTER
51
37
    TABLE with proper arguments.
61
47
    return true;
62
48
  }
63
49
 
64
 
  bool res;
65
 
  if (original_table_message->type() == message::Table::STANDARD )
66
 
  {
67
 
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
68
 
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
69
 
 
70
 
    res= alter_table(session, 
71
 
                     identifier,
72
 
                     identifier,
73
 
                     &create_info, 
74
 
                     *original_table_message,
75
 
                     create_table_message, 
76
 
                     first_table,
77
 
                     &alter_info,
78
 
                     0, (Order*) 0, 0);
79
 
  }
80
 
  else
81
 
  {
82
 
    TableIdentifier catch22(first_table->getSchemaName(), first_table->getTableName());
83
 
    Table *table= session->find_temporary_table(catch22);
84
 
    assert(table);
85
 
    {
86
 
      TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName(), table->getMutableShare()->getPath());
87
 
      create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
88
 
 
89
 
      res= alter_table(session, 
90
 
                       identifier,
91
 
                       identifier,
92
 
                       &create_info, 
93
 
                       *original_table_message,
94
 
                       create_table_message, 
95
 
                       first_table,
96
 
                       &alter_info,
97
 
                       0, (Order*) 0, 0);
98
 
    }
99
 
  }
100
 
 
 
50
  create_info.row_type= ROW_TYPE_NOT_USED;
 
51
  create_info.default_table_charset= get_default_db_collation(session->db.c_str());
 
52
 
 
53
  bool res= alter_table(session, 
 
54
                        first_table->db, 
 
55
                        first_table->table_name,
 
56
                        &create_info, 
 
57
                        &create_table_proto, 
 
58
                        first_table,
 
59
                        &alter_info,
 
60
                        0, (order_st*) 0, 0);
101
61
  return res;
102
62
}
103
63