← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_tables.cc

Remove dead memset call.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/show_dictionary/show_tables.cc
21
21
 
22
22
#include "config.h"
23
23
#include "plugin/show_dictionary/dictionary.h"
24
 
#include "drizzled/table_identifier.h"
 
24
#include "drizzled/identifier.h"
25
25
 
26
26
using namespace std;
27
27
using namespace drizzled;
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
 
    plugin::StorageEngine::getTableIdentifiers(getSession(), identifier, set_of_identifiers);
55
 
    set_of_identifiers.sort();
 
63
    plugin::StorageEngine::getIdentifiers(getSession(), identifier, set_of_identifiers);
56
64
    table_iterator= set_of_identifiers.begin();
57
65
    is_primed= true;
58
66
  }