← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

Merge of Jay

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/scheduling.h>
40
40
#include <drizzled/plugin/client.h>
 
41
#include "drizzled/probes.h"
41
42
 
42
43
#include <algorithm>
43
44
 
480
481
  if (state_to_set != Session::KILL_QUERY)
481
482
  {
482
483
    scheduler->killSession(this);
 
484
    DRIZZLE_CONNECTION_DONE(thread_id);
483
485
  }
484
486
  if (mysys_var)
485
487
  {
619
621
 
620
622
  if (scheduler->addSession(this))
621
623
  {
 
624
    DRIZZLE_CONNECTION_START(thread_id);
622
625
    char error_message_buff[DRIZZLE_ERRMSG_SIZE];
623
626
 
624
627
    killed= Session::KILL_CONNECTION;