← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2010-08-11 18:47:39 UTC
  • mfrom: (1689.2.28 rollup)
  • Revision ID: brian@gaz-20100811184739-ey7llnsu12gfv6hb
No longer concurrent, no longer need these locks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
34
34
#include <boost/thread/condition_variable.hpp>
35
35
 
36
36
#include "drizzled/internal/my_sys.h"
37
 
#include "drizzled/internal/thread_var.h"
38
37
#include "drizzled/internal/my_bit.h"
39
38
#include <drizzled/my_hash.h>
40
39
#include <drizzled/error.h>
425
424
    tmp->killed= Session::KILL_CONNECTION;
426
425
    tmp->scheduler->killSession(tmp);
427
426
    DRIZZLE_CONNECTION_DONE(tmp->thread_id);
428
 
    if (tmp->mysys_var)
429
 
    {
430
 
      tmp->mysys_var->abort=1;
431
 
      pthread_mutex_lock(&tmp->mysys_var->mutex);
432
 
      if (tmp->mysys_var->current_cond)
433
 
      {
434
 
        pthread_mutex_lock(tmp->mysys_var->current_mutex);
435
 
        pthread_cond_broadcast(tmp->mysys_var->current_cond);
436
 
        pthread_mutex_unlock(tmp->mysys_var->current_mutex);
437
 
      }
438
 
      pthread_mutex_unlock(&tmp->mysys_var->mutex);
439
 
    }
 
427
    tmp->lockOnSys();
440
428
  }
441
429
  LOCK_thread_count.unlock(); // For unlink from list
442
430