← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
36
36
#include <drizzled/item/return_int.h>
37
37
#include <drizzled/item/empty_string.h>
38
38
#include <drizzled/show.h>
39
 
#include <drizzled/scheduling.h>
40
39
#include <drizzled/plugin/client.h>
 
40
#include "drizzled/plugin/scheduler.h"
 
41
#include "drizzled/plugin/authentication.h"
41
42
#include "drizzled/probes.h"
42
43
 
43
44
#include <algorithm>
144
145
}
145
146
 
146
147
extern "C"
147
 
void **session_ha_data(const Session *session, const struct StorageEngine *engine)
 
148
void **session_ha_data(const Session *session, const plugin::StorageEngine *engine)
148
149
{
149
150
  return (void **) &session->ha_data[engine->slot].ha_ptr;
150
151
}
608
609
 
609
610
bool Session::schedule()
610
611
{
611
 
  scheduler= get_thread_scheduler();
 
612
  scheduler= plugin::SchedulerFactory::getScheduler();
612
613
 
613
614
  ++connection_count;
614
615
 
670
671
    return false;
671
672
  }
672
673
 
673
 
  is_authenticated= authenticate_user(this, passwd);
 
674
  is_authenticated= plugin::Authentication::isAuthenticated(this, passwd);
674
675
 
675
676
  if (is_authenticated != true)
676
677
  {
1925
1926
 
1926
1927
void Session::close_temporary(Table *table, bool free_share, bool delete_table)
1927
1928
{
1928
 
  StorageEngine *table_type= table->s->db_type();
 
1929
  plugin::StorageEngine *table_type= table->s->db_type();
1929
1930
 
1930
1931
  table->free_io_cache();
1931
1932
  table->closefrm(false);
2151
2152
  return false;
2152
2153
}
2153
2154
 
2154
 
bool Session::rm_temporary_table(StorageEngine *base, char *path)
 
2155
bool Session::rm_temporary_table(plugin::StorageEngine *base, char *path)
2155
2156
{
2156
2157
  bool error=0;
2157
2158