← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2009-03-22 21:27:04 UTC
  • mfrom: (960.2.22 mordred)
  • Revision ID: brian@tangent.org-20090322212704-ysn4mkkjg2u9kv22
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
31
31
#include <drizzled/item/return_int.h>
32
32
#include <drizzled/item/empty_string.h>
33
33
#include <drizzled/show.h>
34
 
#include <drizzled/plugin_scheduling.h>
 
34
#include <drizzled/scheduling.h>
35
35
#include <libdrizzleclient/errmsg.h>
36
36
 
37
 
extern scheduling_st thread_scheduler;
38
37
/*
39
38
  The following is used to initialise Table_ident with a internal
40
39
  table name
529
528
{
530
529
  Session_CHECK_SENTRY(this);
531
530
  safe_mutex_assert_owner(&LOCK_delete);
 
531
  Scheduler &thread_scheduler= get_thread_scheduler();
532
532
 
533
533
  killed= state_to_set;
534
534
  if (state_to_set != Session::KILL_QUERY)
586
586
      pthread_setspecific(THR_Mem_root, &mem_root))
587
587
    return 1;
588
588
  mysys_var=my_thread_var;
 
589
 
589
590
  /*
590
591
    Let mysqld define the thread id (not mysys)
591
592
    This allows us to move Session to different threads if needed.
642
643
  {
643
644
    disconnect(ER_OUT_OF_RESOURCES, true);
644
645
    statistic_increment(aborted_connects, &LOCK_status);
 
646
    Scheduler &thread_scheduler= get_thread_scheduler();
645
647
    thread_scheduler.end_thread(this, 0);
646
648
    return false;
647
649
  }