← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

Merged in latest plugin-slot-reorg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
44
44
#include <drizzled/replication_services.h>
45
45
#include <drizzled/check_stack_overrun.h>
46
46
#include <drizzled/lock.h>
47
 
#include <drizzled/service/listen.h>
 
47
#include <drizzled/plugin/listen.h>
48
48
#include <mysys/cached_directory.h>
49
49
 
50
50
using namespace std;
51
51
using namespace drizzled;
52
52
 
53
 
bool drizzle_rm_tmp_tables(service::Listen &listen_handler);
 
53
bool drizzle_rm_tmp_tables();
54
54
 
55
55
/**
56
56
  @defgroup Data_Dictionary Data Dictionary
1323
1323
                                   table_list->db, table_list->table_name,
1324
1324
                                   false);
1325
1325
 
1326
 
      plugin::Registry &plugins= plugin::Registry::singleton();
1327
 
      if (plugins.storage_engine.getTableProto(path, NULL) != EEXIST)
 
1326
      if (plugin::StorageEngine::getTableProto(path, NULL) != EEXIST)
1328
1327
      {
1329
1328
        /*
1330
1329
          Table to be created, so we need to create placeholder in table-cache.
4533
4532
}
4534
4533
 
4535
4534
 
4536
 
bool drizzle_rm_tmp_tables(service::Listen &listen_handler)
 
4535
bool drizzle_rm_tmp_tables()
4537
4536
{
4538
4537
  char  filePath[FN_REFLEN], filePathCopy[FN_REFLEN];
4539
4538
  Session *session;
4540
4539
 
4541
4540
  assert(drizzle_tmpdir);
4542
4541
 
4543
 
  if (!(session= new Session(listen_handler.getNullClient())))
 
4542
  if (!(session= new Session(plugin::Listen::getNullClient())))
4544
4543
    return true;
4545
4544
  session->thread_stack= (char*) &session;
4546
4545
  session->storeGlobals();