← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/cache.cc

  • Committer: Brian Aker
  • Date: 2010-11-08 18:54:26 UTC
  • mto: (1921.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1916.
  • Revision ID: brian@tangent.org-20101108185426-fymkf2xnelupf11x
Rename lock methods to be style + well make sense.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/cache.cc
200
200
      {
201
201
        /*
202
202
          Mark that table is going to be deleted from cache. This will
203
 
          force threads that are in mysql_lock_tables() (but not yet
 
203
          force threads that are in lockTables() (but not yet
204
204
          in thr_multi_lock()) to abort it's locks, close all tables and retry
205
205
        */
206
206
        in_use->some_tables_deleted= true;
223
223
        {
224
224
          /* Do not handle locks of MERGE children. */
225
225
          if (session_table->db_stat)   // If table is open
226
 
            signalled|= session->mysql_lock_abort_for_thread(session_table);
 
226
            signalled|= session->abortLockForThread(session_table);
227
227
        }
228
228
      }
229
229
      else