← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-10-02 19:38:12 UTC
  • mfrom: (1152.1.7 merge)
  • Revision ID: brian@gaz-20091002193812-mpd61oecep74t6gd
Merge Monty + Brian for plugins.

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/slot/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
 
extern drizzled::ReplicationServices replication_services;
54
 
 
55
 
bool drizzle_rm_tmp_tables(slot::Listen &listen_handler);
 
53
bool drizzle_rm_tmp_tables();
56
54
 
57
55
/**
58
56
  @defgroup Data_Dictionary Data Dictionary
816
814
    close_temporary_table(table, true, true);
817
815
  else
818
816
  {
819
 
    StorageEngine *table_type= table->s->db_type();
 
817
    plugin::StorageEngine *table_type= table->s->db_type();
820
818
    pthread_mutex_lock(&LOCK_open); /* Close and drop a table (AUX routine) */
821
819
    /*
822
820
      unlink_open_table() also tells threads waiting for refresh or close
1325
1323
                                   table_list->db, table_list->table_name,
1326
1324
                                   false);
1327
1325
 
1328
 
      if (StorageEngine::getTableProto(path, NULL) != EEXIST)
 
1326
      if (plugin::StorageEngine::getTableProto(path, NULL) != EEXIST)
1329
1327
      {
1330
1328
        /*
1331
1329
          Table to be created, so we need to create placeholder in table-cache.
2045
2043
  */
2046
2044
  if (unlikely(entry->file->implicit_emptied))
2047
2045
  {
 
2046
    ReplicationServices &replication_services= ReplicationServices::singleton();
2048
2047
    entry->file->implicit_emptied= 0;
2049
2048
    {
2050
2049
      char *query, *end;
4533
4532
}
4534
4533
 
4535
4534
 
4536
 
bool drizzle_rm_tmp_tables(slot::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();