← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2010-08-13 18:47:12 UTC
  • mfrom: (1703.1.4 staging)
  • Revision ID: brian@tangent.org-20100813184712-rx8hjq33powaaqlv
Merge MyISAM changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
561
561
}
562
562
 
563
563
 
564
 
const char* Session::enter_cond(pthread_cond_t *cond,
565
 
                                pthread_mutex_t* mutex,
566
 
                                const char* msg)
 
564
const char* Session::enter_cond(boost::condition_variable &cond, boost::mutex &mutex, const char* msg)
567
565
{
568
566
  const char* old_msg = get_proc_info();
569
567
  safe_mutex_assert_owner(mutex);
570
 
  mysys_var->current_mutex = mutex;
571
 
  mysys_var->current_cond = cond;
 
568
  mysys_var->current_mutex = mutex.native_handle();
 
569
  mysys_var->current_cond = cond.native_handle();
572
570
  this->set_proc_info(msg);
573
571
  return old_msg;
574
572
}