~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

  • Committer: Lee Bieber
  • Date: 2011-01-08 03:39:25 UTC
  • mfrom: (2062.1.2 build)
  • Revision ID: kalebral@gmail.com-20110108033925-koobar399kwrm4ba
Merge Brian - parser clean up
Merge Marisa - latest doc updates, fix sphinx warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
65
65
  if (original_table_message->type() == message::Table::STANDARD )
66
66
  {
67
67
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
68
 
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
 
68
    create_info().default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
69
69
 
70
70
    res= alter_table(session, 
71
71
                     identifier,
72
72
                     identifier,
73
 
                     &create_info, 
 
73
                     &create_info(), 
74
74
                     *original_table_message,
75
 
                     create_table_message, 
 
75
                     createTableMessage(), 
76
76
                     first_table,
77
77
                     &alter_info,
78
78
                     0, (Order*) 0, 0);
84
84
    assert(table);
85
85
    {
86
86
      TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName(), table->getMutableShare()->getPath());
87
 
      create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
 
87
      create_info().default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
88
88
 
89
89
      res= alter_table(session, 
90
90
                       identifier,
91
91
                       identifier,
92
 
                       &create_info, 
 
92
                       &create_info(), 
93
93
                       *original_table_message,
94
 
                       create_table_message, 
 
94
                       createTableMessage(), 
95
95
                       first_table,
96
96
                       &alter_info,
97
97
                       0, (Order*) 0, 0);