← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.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/db.cc
272
272
    else
273
273
    {
274
274
      LOCK_open.lock(); /* After deleting database, remove all cache entries related to schema */
275
 
      remove_db_from_cache(schema_identifier);
 
275
      table::Cache::singleton().removeSchema(schema_identifier);
276
276
      LOCK_open.unlock();
277
277
 
278
278
 
399
399
    {
400
400
      Table *locked_table;
401
401
      abort_locked_tables(session, identifier);
402
 
      remove_table_from_cache(session, identifier,
403
 
                              RTFC_WAIT_OTHER_THREAD_FLAG |
404
 
                              RTFC_CHECK_KILLED_FLAG);
 
402
      table::Cache::singleton().removeTable(session, identifier,
 
403
                                            RTFC_WAIT_OTHER_THREAD_FLAG |
 
404
                                            RTFC_CHECK_KILLED_FLAG);
405
405
      /*
406
406
        If the table was used in lock tables, remember it so that
407
407
        unlock_table_names can free it