← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_tables.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_tables.cc
38
38
{
39
39
  statement::Select *select= static_cast<statement::Select *>(getSession().lex->statement);
40
40
 
41
 
  schema_name.append(select->getShowSchema());
42
 
  assert(not schema_name.empty());
 
41
  if (not select->getShowSchema().empty())
 
42
  {
 
43
    schema_name.append(select->getShowSchema());
 
44
    assert(not schema_name.empty());
 
45
  }
43
46
}
44
47
 
45
48
bool ShowTables::Generator::nextCore()
50
53
  }
51
54
  else
52
55
  {
 
56
    if (schema_name.empty())
 
57
    {
 
58
      is_primed= true;
 
59
      return false;
 
60
    }
 
61
 
53
62
    SchemaIdentifier identifier(schema_name);
54
63
    plugin::StorageEngine::getTableIdentifiers(getSession(), identifier, set_of_identifiers);
55
64
    set_of_identifiers.sort();