← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

Merged in plugin-slot-reorg patches.

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
 
41
40
#include <algorithm>
42
41
 
605
604
 
606
605
bool Session::schedule()
607
606
{
608
 
  scheduler= get_thread_scheduler();
 
607
  plugin::Registry &plugins= plugin::Registry::singleton();
 
608
 
 
609
  scheduler= plugins.scheduler.getScheduler();
609
610
 
610
611
  ++connection_count;
611
612
 
649
650
 
650
651
bool Session::checkUser(const char *passwd, uint32_t passwd_len, const char *in_db)
651
652
{
 
653
  plugin::Registry &plugins= plugin::Registry::singleton();
652
654
  LEX_STRING db_str= { (char *) in_db, in_db ? strlen(in_db) : 0 };
653
655
  bool is_authenticated;
654
656
 
666
668
    return false;
667
669
  }
668
670
 
669
 
  is_authenticated= authenticate_user(this, passwd);
 
671
  is_authenticated= plugins.authentication.authenticate(this, passwd);
670
672
 
671
673
  if (is_authenticated != true)
672
674
  {