← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.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/sql_base.cc
314
314
 
315
315
  if (wait_for_refresh)
316
316
  {
317
 
    boost_unique_lock_t scopedLock(session->mysys_var->mutex);
 
317
    boost::mutex::scoped_lock scopedLock(session->mysys_var->mutex);
318
318
    session->mysys_var->current_mutex= 0;
319
319
    session->mysys_var->current_cond= 0;
320
320
    session->set_proc_info(0);
381
381
 
382
382
  safe_mutex_assert_not_owner(table::Cache::mutex().native_handle());
383
383
 
384
 
  boost_unique_lock_t scoped_lock(table::Cache::mutex()); /* Close all open tables on Session */
 
384
  boost::mutex::scoped_lock scoped_lock(table::Cache::mutex()); /* Close all open tables on Session */
385
385
 
386
386
  while (open_tables.open_tables_)
387
387
  {
722
722
  }
723
723
  else
724
724
  {
725
 
    boost_unique_lock_t scoped_lock(table::Cache::mutex()); /* Close and drop a table (AUX routine) */
 
725
    boost::mutex::scoped_lock scoped_lock(table::Cache::mutex()); /* Close and drop a table (AUX routine) */
726
726
    /*
727
727
      unlink_open_table() also tells threads waiting for refresh or close
728
728
      that something has happened.
763
763
      condition variables that are guranteed to not disapper (freed) even if this
764
764
      mutex is unlocked
765
765
    */
766
 
    boost_unique_lock_t scopedLock(mutex, boost::adopt_lock_t());
 
766
    boost::mutex::scoped_lock scopedLock(mutex, boost::adopt_lock_t());
767
767
    if (not getKilled())
768
768
    {
769
769
      cond.wait(scopedLock);
770
770
    }
771
771
  }
772
 
  boost_unique_lock_t mysys_scopedLock(mysys_var->mutex);
 
772
  boost::mutex::scoped_lock mysys_scopedLock(mysys_var->mutex);
773
773
  mysys_var->current_mutex= 0;
774
774
  mysys_var->current_cond= 0;
775
775
  set_proc_info(saved_proc_info);
828
828
{
829
829
  const identifier::Table::Key &key(identifier.getKey());
830
830
 
831
 
  boost_unique_lock_t scope_lock(table::Cache::mutex()); /* Obtain a name lock even though table is not in cache (like for create table)  */
 
831
  boost::mutex::scoped_lock scope_lock(table::Cache::mutex()); /* Obtain a name lock even though table is not in cache (like for create table)  */
832
832
 
833
833
  if (find_ptr(table::getCache(), key))
834
834
  {