← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Olaf van der Spek
  • Date: 2011-04-13 12:17:56 UTC
  • mto: (2277.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2278.
  • Revision ID: olafvdspek@gmail.com-20110413121756-8zsjfrl52qb28vx1
Thread

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
392
392
    return;
393
393
 
394
394
  setAbort(true);
395
 
  boost_unique_lock_t scopedLock(mysys_var->mutex);
 
395
  boost::mutex::scoped_lock scopedLock(mysys_var->mutex);
396
396
  if (mysys_var->current_cond)
397
397
  {
398
398
    mysys_var->current_mutex->lock();
510
510
 
511
511
  if (mysys_var)
512
512
  {
513
 
    boost_unique_lock_t scopedLock(mysys_var->mutex);
 
513
    boost::mutex::scoped_lock scopedLock(mysys_var->mutex);
514
514
    /*
515
515
      "
516
516
      This broadcast could be up in the air if the victim thread
703
703
    does a Session::awake() on you).
704
704
  */
705
705
  mysys_var->current_mutex->unlock();
706
 
  boost_unique_lock_t scopedLock(mysys_var->mutex);
 
706
  boost::mutex::scoped_lock scopedLock(mysys_var->mutex);
707
707
  mysys_var->current_mutex = 0;
708
708
  mysys_var->current_cond = 0;
709
709
  this->set_proc_info(old_msg);