← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

Merged in latest plugin-slot-reorg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
38
38
#include <drizzled/show.h>
39
39
#include <drizzled/plugin/client.h>
40
40
#include "drizzled/plugin/scheduler.h"
 
41
#include "drizzled/plugin/authentication.h"
41
42
#include "drizzled/probes.h"
42
43
 
43
44
#include <algorithm>
227
228
  thread_id= 0;
228
229
  file_id = 0;
229
230
  query_id= 0;
 
231
  query= NULL;
 
232
  query_length= 0;
230
233
  warn_id= 0;
231
234
  memset(ha_data, 0, sizeof(ha_data));
232
235
  replication_data= 0;
606
609
 
607
610
bool Session::schedule()
608
611
{
609
 
  plugin::Registry &plugins= plugin::Registry::singleton();
610
 
 
611
 
  scheduler= plugins.scheduler.getScheduler();
 
612
  scheduler= plugin::SchedulerFactory::getScheduler();
612
613
 
613
614
  ++connection_count;
614
615
 
653
654
 
654
655
bool Session::checkUser(const char *passwd, uint32_t passwd_len, const char *in_db)
655
656
{
656
 
  plugin::Registry &plugins= plugin::Registry::singleton();
657
657
  LEX_STRING db_str= { (char *) in_db, in_db ? strlen(in_db) : 0 };
658
658
  bool is_authenticated;
659
659
 
671
671
    return false;
672
672
  }
673
673
 
674
 
  is_authenticated= plugins.authentication.authenticate(this, passwd);
 
674
  is_authenticated= plugin::Authentication::isAuthenticated(this, passwd);
675
675
 
676
676
  if (is_authenticated != true)
677
677
  {