← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/schemas.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-03-15 14:05:26 UTC
  • mfrom: (1237.9.99 staging)
  • Revision ID: osullivan.padraig@gmail.com-20100315140526-opbgwdwn6tfecdkq
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/schemas.cc
43
43
*/
44
44
bool SchemasTool::Generator::checkSchema()
45
45
{
46
 
  return isWild(schema_name());
 
46
  if (isWild(schema_name()))
 
47
    return true;
 
48
 
 
49
  if (not schema_predicate.empty() && schema_predicate.compare(schema_name()))
 
50
    return true;
 
51
 
 
52
  return false;
47
53
}
48
54
 
49
55
bool SchemasTool::Generator::nextSchemaCore()
65
71
  schema.Clear();
66
72
  is_schema_parsed= plugin::StorageEngine::getSchemaDefinition(*schema_iterator, schema);
67
73
 
 
74
  if (not is_schema_parsed)
 
75
  {
 
76
    cerr << "Failure to parse " << *schema_iterator << "\n";
 
77
    return false;
 
78
  }
 
79
 
68
80
  if (checkSchema())
69
81
      return false;
70
82