← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2010-10-28 14:57:34 UTC
  • mfrom: (1887.2.5 merge)
  • mto: This revision was merged to the branch mainline in revision 1888.
  • Revision ID: brian@tangent.org-20101028145734-ka5tdcj2i3w162of
Rollup merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
180
180
    {
181
181
      Table *locked_table;
182
182
      abort_locked_tables(session, tmp_identifier);
183
 
      remove_table_from_cache(session, tmp_identifier,
184
 
                              RTFC_WAIT_OTHER_THREAD_FLAG |
185
 
                              RTFC_CHECK_KILLED_FLAG);
 
183
      table::Cache::singleton().removeTable(session, tmp_identifier,
 
184
                                            RTFC_WAIT_OTHER_THREAD_FLAG |
 
185
                                            RTFC_CHECK_KILLED_FLAG);
186
186
      /*
187
187
        If the table was used in lock tables, remember it so that
188
188
        unlock_table_names can free it
1680
1680
 
1681
1681
  /* Wait until all there are no other threads that has this table open */
1682
1682
  TableIdentifier identifier(table->getShare()->getSchemaName(), table->getShare()->getTableName());
1683
 
  remove_table_from_cache(session, identifier, RTFC_WAIT_OTHER_THREAD_FLAG);
 
1683
  table::Cache::singleton().removeTable(session, identifier, RTFC_WAIT_OTHER_THREAD_FLAG);
1684
1684
}
1685
1685
 
1686
1686
/*
1831
1831
                                                  "Waiting to get writelock");
1832
1832
      mysql_lock_abort(session,table->table);
1833
1833
      TableIdentifier identifier(table->table->getShare()->getSchemaName(), table->table->getShare()->getTableName());
1834
 
      remove_table_from_cache(session, identifier,
1835
 
                              RTFC_WAIT_OTHER_THREAD_FLAG |
1836
 
                              RTFC_CHECK_KILLED_FLAG);
 
1834
      table::Cache::singleton().removeTable(session, identifier, RTFC_WAIT_OTHER_THREAD_FLAG | RTFC_CHECK_KILLED_FLAG);
1837
1835
      session->exit_cond(old_message);
1838
1836
      if (session->killed)
1839
1837
        goto err;
1935
1933
        {
1936
1934
          boost::unique_lock<boost::mutex> lock(LOCK_open);
1937
1935
          TableIdentifier identifier(table->table->getShare()->getSchemaName(), table->table->getShare()->getTableName());
1938
 
          remove_table_from_cache(session, identifier, RTFC_NO_FLAG);
 
1936
          table::Cache::singleton().removeTable(session, identifier, RTFC_NO_FLAG);
1939
1937
        }
1940
1938
      }
1941
1939
    }