← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/schemas.cc

  • Committer: Brian Aker
  • Date: 2010-03-31 05:53:34 UTC
  • Revision ID: brian@gaz-20100331055334-yqqmzlgqb2xq1p5b
Mass overhaul to use schema_identifier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/schemas.cc
60
60
  else
61
61
  {
62
62
    Session *session= current_session;
63
 
    plugin::StorageEngine::getSchemaNames(*session, schema_names);
 
63
    plugin::StorageEngine::getSchemaIdentifiers(*session, schema_names);
 
64
    schema_names.sort();
64
65
    schema_iterator= schema_names.begin();
65
66
    is_schema_primed= true;
66
67
  }
69
70
    return false;
70
71
 
71
72
  schema.Clear();
72
 
  is_schema_parsed= plugin::StorageEngine::getSchemaDefinition(*schema_iterator, schema);
 
73
  SchemaIdentifier schema_identifier(*schema_iterator);
 
74
  is_schema_parsed= plugin::StorageEngine::getSchemaDefinition(schema_identifier, schema);
73
75
 
74
76
  if (not is_schema_parsed)
75
77
  {
76
 
    cerr << "Failure to parse " << *schema_iterator << "\n";
77
78
    return false;
78
79
  }
79
80