← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

  • Committer: Brian Aker
  • Date: 2011-01-17 04:15:23 UTC
  • mto: (2088.1.3 merge)
  • mto: This revision was merged to the branch mainline in revision 2089.
  • Revision ID: brian@gir-3-20110117041523-o9ex94kfz1a6iqyw
Modify TableIdentifier to fit with the rest of the identifiers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_index.cc
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
37
  message::table::shared_ptr original_table_message;
38
38
  {
39
 
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
 
39
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
40
40
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
41
41
    {
42
42
      std::string path;
64
64
  bool res;
65
65
  if (original_table_message->type() == message::Table::STANDARD )
66
66
  {
67
 
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
 
67
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
68
68
    create_info().default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
69
69
 
70
70
    res= alter_table(session, 
79
79
  }
80
80
  else
81
81
  {
82
 
    TableIdentifier catch22(first_table->getSchemaName(), first_table->getTableName());
 
82
    identifier::Table catch22(first_table->getSchemaName(), first_table->getTableName());
83
83
    Table *table= session->find_temporary_table(catch22);
84
84
    assert(table);
85
85
    {
86
 
      TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName(), table->getMutableShare()->getPath());
 
86
      identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName(), table->getMutableShare()->getPath());
87
87
      create_info().default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
88
88
 
89
89
      res= alter_table(session,