← Back to branch summary

~skinny.moey/drizzle/tlog_no_changes_enabled

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

  • Committer: Brian Aker
  • Date: 2010-10-28 17:12:01 UTC
  • mfrom: (1887.1.3 merge)
  • Revision ID: brian@tangent.org-20101028171201-baj6l1bnntn1s4ad
Merge in POTFILES changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
687
687
 
688
688
  {
689
689
    /* Only insert the table if we haven't insert it already */
690
 
    TableOpenCacheRange ppp;
691
 
 
692
 
    ppp= get_open_cache().equal_range(key);
693
 
 
694
 
    for (TableOpenCache::const_iterator iter= ppp.first;
 
690
    table::CacheRange ppp;
 
691
 
 
692
    ppp= table::getCache().equal_range(key);
 
693
 
 
694
    for (table::CacheMap::const_iterator iter= ppp.first;
695
695
         iter != ppp.second; ++iter)
696
696
    {
697
697
      Table *table= (*iter).second;
709
709
    }
710
710
  }
711
711
 
712
 
  Table *table;
 
712
  table::Placeholder *table= NULL;
713
713
  if (!(table= session->table_cache_insert_placeholder(identifier)))
714
714
  {
715
715
    return -1;
716
716
  }
717
717
 
718
 
  table_list->table= table;
 
718
  table_list->table= reinterpret_cast<Table *>(table);
719
719
 
720
720
  /* Return 1 if table is in use */
721
 
  return(test(remove_table_from_cache(session, identifier, RTFC_NO_FLAG)));
 
721
  return(test(table::Cache::singleton().removeTable(session, identifier, RTFC_NO_FLAG)));
722
722
}
723
723
 
724
724
 
726
726
{
727
727
  if (table_list->table)
728
728
  {
729
 
    remove_table(static_cast<table::Concurrent *>(table_list->table));
 
729
    table::remove_table(static_cast<table::Concurrent *>(table_list->table));
730
730
    broadcast_refresh();
731
731
  }
732
732
}
742
742
      Table *save_next= table->getNext();
743
743
      bool result;
744
744
      table->setNext(NULL);
745
 
      result= table_is_used(table_list->table, 0);
 
745
      result= table::Cache::singleton().areTablesUsed(table_list->table, 0);
746
746
      table->setNext(save_next);
747
747
      if (result)
748
748
        return 1;