← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/schema.cc

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/schema.cc
46
46
  {
47
47
    identifier::Schema schema_identifier(*schema_iterator);
48
48
 
49
 
    if (not plugin::Authorization::isAuthorized(session.user(), schema_identifier, false))
 
49
    if (not plugin::Authorization::isAuthorized(*session.user(), schema_identifier, false))
50
50
    {
51
51
      schema_iterator++;
52
52
      continue;
53
53
    }
54
54
 
55
 
    bool is_schema_parsed= plugin::StorageEngine::getSchemaDefinition(schema_identifier, schema);
 
55
    schema= plugin::StorageEngine::getSchemaDefinition(schema_identifier);
56
56
    schema_iterator++;
57
57
 
58
 
    if (is_schema_parsed)
 
58
    if (schema)
59
59
      return schema;
60
60
  }
61
61
 
69
69
    const drizzled::identifier::Schema *_ptr= &(*schema_iterator);
70
70
    schema_iterator++;
71
71
 
72
 
    if (not plugin::Authorization::isAuthorized(session.user(), *_ptr, false))
 
72
    if (not plugin::Authorization::isAuthorized(*session.user(), *_ptr, false))
73
73
      continue;
74
74
 
75
75
    return _ptr;