~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/schema.cc

  • Committer: Lee Bieber
  • Date: 2011-02-17 04:08:28 UTC
  • mfrom: (2172.3.5 drizzle-build)
  • Revision ID: kalebral@gmail.com-20110217040828-433pc76qapign1of
Merge Brian - add the DDL for replication

Show diffs side-by-side

added added

removed removed

Lines of Context:
237
237
  do
238
238
  {
239
239
    boost::mutex::scoped_lock scopedLock(session.catalog().schemaLock());
 
240
    message::schema::shared_ptr message= plugin::StorageEngine::getSchemaDefinition(schema_identifier);
240
241
 
241
242
    /* See if the schema exists */
242
 
    if (not plugin::StorageEngine::doesSchemaExist(schema_identifier))
 
243
    if (not message)
243
244
    {
244
245
      if (if_exists)
245
246
      {
259
260
    }
260
261
    else
261
262
    {
262
 
      error= plugin::StorageEngine::dropSchema(session, schema_identifier);
 
263
      error= plugin::StorageEngine::dropSchema(session, schema_identifier, *message);
263
264
    }
264
265
 
265
266
  } while (0);