~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

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