← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/schema.cc

  • Committer: Brian Aker
  • Date: 2011-04-22 15:01:43 UTC
  • mfrom: (2281.4.4 prune)
  • Revision ID: brian@tangent.org-20110422150143-fepk5ob90v66b9r3
Merge in Olaf

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/schema.cc
227
227
  {
228
228
    boost::mutex::scoped_lock scopedLock(session.catalog().schemaLock());
229
229
    if (message::schema::shared_ptr message= plugin::StorageEngine::getSchemaDefinition(schema_identifier))
230
 
                {
231
 
                        error= plugin::StorageEngine::dropSchema(session, schema_identifier, *message);
232
 
                }
233
 
                else if (if_exists)
 
230
    {
 
231
      error= plugin::StorageEngine::dropSchema(session, schema_identifier, *message);
 
232
    }
 
233
    else if (if_exists)
234
234
    {
235
235
      push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_NOTE, ER_DB_DROP_EXISTS, ER(ER_DB_DROP_EXISTS),
236
 
                                schema_identifier.getSQLPath().c_str());
 
236
                          schema_identifier.getSQLPath().c_str());
237
237
    }
238
238
    else
239
239
    {