← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/schema_engine.cc

  • Committer: Brian Aker
  • Date: 2011-04-12 16:33:34 UTC
  • mfrom: (2272.1.3 cache)
  • Revision ID: brian@sccc-67-111-115-252.smartcity.com-20110412163334-cpk0qmwpqlroicb9
Merge in Olaf

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/schema_engine.cc
25
25
#include <drizzled/charset.h>
26
26
#include <drizzled/transaction_services.h>
27
27
#include <drizzled/open_tables_state.h>
28
 
 
 
28
#include <drizzled/table/cache.h>
29
29
#include <drizzled/plugin/storage_engine.h>
30
30
#include <drizzled/plugin/authorization.h>
31
31
 
32
 
namespace drizzled
33
 
{
34
 
 
35
 
namespace plugin
36
 
{
 
32
namespace drizzled {
 
33
namespace plugin {
37
34
 
38
35
class AddSchemaNames :
39
36
  public std::unary_function<StorageEngine *, void>
222
219
      return false;
223
220
    }
224
221
 
225
 
    table::Cache::singleton().removeTable(&session, *it,
226
 
                                          RTFC_WAIT_OTHER_THREAD_FLAG |
227
 
                                          RTFC_CHECK_KILLED_FLAG);
 
222
    table::Cache::singleton().removeTable(session, *it, RTFC_WAIT_OTHER_THREAD_FLAG | RTFC_CHECK_KILLED_FLAG);
228
223
    if (not plugin::StorageEngine::dropTable(session, *it))
229
224
    {
230
225
      my_error(ER_TABLE_DROP, *it);