← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

updating to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_index.cc
28
28
namespace drizzled
29
29
{
30
30
 
 
31
namespace statement
 
32
{
 
33
 
 
34
CreateIndex::CreateIndex(Session *in_session, Table_ident *ident) :
 
35
    CreateTable(in_session)
 
36
{
 
37
  (void)ident;
 
38
}
 
39
 
 
40
}
 
41
 
31
42
bool statement::CreateIndex::execute()
32
43
{
33
 
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
34
 
  TableList *all_tables= session->lex->query_tables;
 
44
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
 
45
  TableList *all_tables= getSession()->lex->query_tables;
35
46
 
36
47
  /* 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
48
  message::table::shared_ptr original_table_message;
38
49
  {
39
50
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
40
 
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
 
51
    if (plugin::StorageEngine::getTableDefinition(*getSession(), identifier, original_table_message) != EEXIST)
41
52
    {
42
 
      std::string path;
43
 
      identifier.getSQLPath(path);
44
 
      my_error(ER_BAD_TABLE_ERROR, MYF(0), path.c_str());
 
53
      my_error(ER_BAD_TABLE_ERROR, identifier);
45
54
      return true;
46
55
    }
47
56
  }
56
65
  */
57
66
 
58
67
  assert(first_table == all_tables && first_table != 0);
59
 
  if (session->inTransaction())
 
68
  if (getSession()->inTransaction())
60
69
  {
61
70
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
62
71
    return true;
68
77
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
69
78
    create_info().default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
70
79
 
71
 
    res= alter_table(session, 
 
80
    res= alter_table(getSession(), 
72
81
                     identifier,
73
82
                     identifier,
74
83
                     &create_info(), 
81
90
  else
82
91
  {
83
92
    identifier::Table catch22(first_table->getSchemaName(), first_table->getTableName());
84
 
    Table *table= session->find_temporary_table(catch22);
 
93
    Table *table= getSession()->find_temporary_table(catch22);
85
94
    assert(table);
86
95
    {
87
96
      identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName(), table->getMutableShare()->getPath());
88
97
      create_info().default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
89
98
 
90
 
      res= alter_table(session, 
 
99
      res= alter_table(getSession(), 
91
100
                       identifier,
92
101
                       identifier,
93
102
                       &create_info(),