← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merge of Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
45
45
#include "drizzled/temporal_format.h" /* For init_temporal_formats() */
46
46
#include "drizzled/slot/listen.h"
47
47
#include "drizzled/plugin/client.h"
 
48
#include "drizzled/probes.h"
48
49
 
49
50
#include <google/protobuf/stubs/common.h>
50
51
 
457
458
    tmp= *it;
458
459
    tmp->killed= Session::KILL_CONNECTION;
459
460
    tmp->scheduler->killSession(tmp);
 
461
    DRIZZLE_CONNECTION_DONE(tmp->thread_id);
460
462
    if (tmp->mysys_var)
461
463
    {
462
464
      tmp->mysys_var->abort=1;
767
769
  {
768
770
    statistic_increment(killed_threads, &LOCK_status);
769
771
    session->scheduler->killSessionNow(session);
 
772
    DRIZZLE_CONNECTION_DONE(session->thread_id);
770
773
  }
771
774
  return;
772
775
}