← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

  • Committer: LinuxJedi
  • Date: 2010-08-28 09:23:52 UTC
  • mto: (1738.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1739.
  • Revision ID: linuxjedi@linuxjedi-laptop-20100828092352-oe3zbtdy05kq9dtq
Make exit happen in main thread rather than signal handler thread thus avoiding a segfault due to a double kill of the signal handler thread

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