← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_columns.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_columns.cc
56
56
{
57
57
  statement::Select *select= static_cast<statement::Select *>(getSession().lex->statement);
58
58
 
59
 
  table_name.append(select->getShowTable().c_str());
60
 
  TableIdentifier identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
 
59
  if (not select->getShowTable().empty() && not select->getShowSchema().empty())
 
60
  {
 
61
    table_name.append(select->getShowTable().c_str());
 
62
    TableIdentifier identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
61
63
 
62
 
  is_tables_primed= plugin::StorageEngine::getTableDefinition(getSession(),
63
 
                                                              identifier,
64
 
                                                              table_proto);
 
64
    is_tables_primed= plugin::StorageEngine::getTableDefinition(getSession(),
 
65
                                                                identifier,
 
66
                                                                table_proto);
 
67
  }
65
68
}
66
69
 
67
70
bool ShowColumns::Generator::nextColumnCore()