← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_indexes.cc

  • Committer: Jay Pipes
  • Date: 2010-04-08 16:27:25 UTC
  • mfrom: (1405.6.10 replication-pairs)
  • mto: This revision was merged to the branch mainline in revision 1457.
  • Revision ID: jpipes@serialcoder-20100408162725-sugbgn38oxjqclq2
Merge trunk and replication-pairs with conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/show_dictionary/show_indexes.cc
46
46
{
47
47
  statement::Select *select= static_cast<statement::Select *>(getSession().lex->statement);
48
48
 
49
 
  table_name.append(select->getShowTable().c_str());
50
 
  TableIdentifier identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
 
49
  if (not select->getShowTable().empty() && not select->getShowSchema().empty())
 
50
  {
 
51
    table_name.append(select->getShowTable().c_str());
 
52
    TableIdentifier identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
51
53
 
52
 
  is_tables_primed= plugin::StorageEngine::getTableDefinition(getSession(),
53
 
                                                              identifier,
54
 
                                                              table_proto);
 
54
    is_tables_primed= plugin::StorageEngine::getTableDefinition(getSession(),
 
55
                                                                identifier,
 
56
                                                                table_proto);
 
57
  }
55
58
}
56
59
 
57
60
bool ShowIndexes::Generator::nextIndexCore()