← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_schema.cc

  • Committer: Mark Atwood
  • Date: 2011-10-13 18:28:03 UTC
  • mfrom: (2433.1.5 rf1)
  • Revision ID: me@mark.atwood.name-20111013182803-pbmb3r5emfxfrbvy
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_schema.cc
42
42
  if (not validateSchemaOptions())
43
43
    return true;
44
44
 
45
 
  identifier::Schema schema_identifier(string(db->str, db->length));
 
45
  identifier::Schema schema_identifier(string(db->data(), db->size()));
46
46
 
47
47
  if (not schema::check(session(), schema_identifier))
48
48
  {
51
51
    return false;
52
52
  }
53
53
 
54
 
  identifier::Schema identifier(db->str);
 
54
  identifier::Schema identifier(db->data());
55
55
  if (not (old_definition= plugin::StorageEngine::getSchemaDefinition(identifier)))
56
56
  {
57
57
    my_error(ER_SCHEMA_DOES_NOT_EXIST, identifier);