← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/schema_engine.cc

  • Committer: Lee Bieber
  • Date: 2011-01-05 01:41:02 UTC
  • mfrom: (2054.1.2 clean)
  • Revision ID: kalebral@gmail.com-20110105014102-e1sfrth1cesuwyf7
Merge Brian - Rename of the Loooongggggg   error type over to simply drizzled::error_t
Merge Brian - Cleanup of error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/schema_engine.cc
221
221
                                          RTFC_CHECK_KILLED_FLAG);
222
222
    if (plugin::StorageEngine::dropTable(session, *it))
223
223
    {
224
 
      my_error(ER_TABLE_DROP, MYF(0), (*it).getTableName().c_str());
 
224
      my_error(ER_TABLE_DROP, *it);
225
225
      return false;
226
226
    }
227
227
    transaction_services.dropTable(&session, *it, true);
251
251
      {
252
252
        if (session.drop_temporary_table(*iter))
253
253
        {
254
 
          my_error(ER_TABLE_DROP, MYF(0), (*iter).getTableName().c_str());
 
254
          my_error(ER_TABLE_DROP, *iter);
255
255
          error= true;
256
256
          break;
257
257
        }
264
264
    if (not drop_all_tables_in_schema(session, identifier, dropped_tables, deleted))
265
265
    {
266
266
      error= true;
267
 
      my_error(ER_DROP_SCHEMA, MYF(0), identifier.getSchemaName().c_str());
 
267
      my_error(ER_DROP_SCHEMA, identifier);
268
268
      break;
269
269
    }
270
270
 
275
275
 
276
276
    if (not counter)
277
277
    {
278
 
      std::string path;
279
 
      identifier.getSQLPath(path);
280
 
      my_error(ER_DROP_SCHEMA, MYF(0), path.c_str());
 
278
      my_error(ER_DROP_SCHEMA, identifier);
281
279
      error= true;
282
280
 
283
281
      break;