← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

https://launchpad.net/bugs/586348
fix pthread atomics. operator precedence is important. The unit test now passes.

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::TablePtr original_table_message;
 
37
  message::Table original_table_message;
38
38
  {
39
 
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
 
39
    TableIdentifier identifier(first_table->db, first_table->table_name);
40
40
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
41
41
    {
42
42
      my_error(ER_BAD_TABLE_ERROR, MYF(0), identifier.getSQLPath().c_str());
59
59
    return true;
60
60
  }
61
61
 
 
62
  create_info.row_type= ROW_TYPE_NOT_USED;
 
63
 
62
64
  bool res;
63
 
  if (original_table_message->type() == message::Table::STANDARD )
 
65
  if (original_table_message.type() == message::Table::STANDARD )
64
66
  {
65
 
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
 
67
    TableIdentifier identifier(first_table->db, first_table->table_name);
66
68
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
67
69
 
68
70
    res= alter_table(session, 
69
71
                     identifier,
70
72
                     identifier,
71
73
                     &create_info, 
72
 
                     *original_table_message,
 
74
                     original_table_message,
73
75
                     create_table_message, 
74
76
                     first_table,
75
77
                     &alter_info,
76
 
                     0, (Order*) 0, 0);
 
78
                     0, (order_st*) 0, 0);
77
79
  }
78
80
  else
79
81
  {
80
 
    TableIdentifier catch22(first_table->getSchemaName(), first_table->getTableName());
81
 
    Table *table= session->find_temporary_table(catch22);
 
82
    Table *table= session->find_temporary_table(first_table);
82
83
    assert(table);
83
84
    {
84
 
      TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName(), table->getMutableShare()->getPath());
 
85
      TableIdentifier identifier(first_table->db, first_table->table_name, table->s->getPath());
85
86
      create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
86
87
 
87
88
      res= alter_table(session, 
88
89
                       identifier,
89
90
                       identifier,
90
91
                       &create_info, 
91
 
                       *original_table_message,
 
92
                       original_table_message,
92
93
                       create_table_message, 
93
94
                       first_table,
94
95
                       &alter_info,
95
 
                       0, (Order*) 0, 0);
 
96
                       0, (order_st*) 0, 0);
96
97
    }
97
98
  }
98
99