← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Monty Taylor
  • Date: 2009-03-21 19:04:05 UTC
  • mto: (960.2.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 961.
  • Revision ID: mordred@inaugust.com-20090321190405-ww33frld1yrk7gqp
Changed get_thread_scheduler to returning a reference.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
528
528
{
529
529
  Session_CHECK_SENTRY(this);
530
530
  safe_mutex_assert_owner(&LOCK_delete);
531
 
  Scheduler *thread_scheduler= get_thread_scheduler();
 
531
  Scheduler &thread_scheduler= get_thread_scheduler();
532
532
 
533
533
  killed= state_to_set;
534
534
  if (state_to_set != Session::KILL_QUERY)
535
535
  {
536
 
    thread_scheduler->post_kill_notification(this);
 
536
    thread_scheduler.post_kill_notification(this);
537
537
  }
538
538
  if (mysys_var)
539
539
  {
643
643
  {
644
644
    disconnect(ER_OUT_OF_RESOURCES, true);
645
645
    statistic_increment(aborted_connects, &LOCK_status);
646
 
    Scheduler *thread_scheduler= get_thread_scheduler();
647
 
    thread_scheduler->end_thread(this, 0);
 
646
    Scheduler &thread_scheduler= get_thread_scheduler();
 
647
    thread_scheduler.end_thread(this, 0);
648
648
    return false;
649
649
  }
650
650
  return true;