← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/flush.cc

  • Committer: Brian Aker
  • Date: 2010-11-08 05:00:04 UTC
  • mto: (1921.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1916.
  • Revision ID: brian@tangent.org-20101108050004-l50ikx9zdtcq1e5a
First pass through the global lock refactor merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/flush.cc
69
69
  {
70
70
    if (session && flush_tables_with_read_lock)
71
71
    {
72
 
      if (lock_global_read_lock(session))
 
72
      if (session->lockGlobalReadLock())
73
73
      {
74
74
        return true; /* Killed */
75
75
      }
76
76
      result= session->close_cached_tables(tables, true, true);
77
77
 
78
 
      if (make_global_read_lock_block_commit(session)) /* Killed */
 
78
      if (session->makeGlobalReadLockBlockCommit()) /* Killed */
79
79
      {
80
80
        /* Don't leave things in a half-locked state */
81
 
        unlock_global_read_lock(session);
 
81
        session->unlockGlobalReadLock();
82
82
        return true;
83
83
      }
84
84
    }