← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/locking/global.cc

  • Committer: Monty Taylor
  • Date: 2011-04-06 21:23:45 UTC
  • mfrom: (2268.1.4 build)
  • Revision ID: mordred@inaugust.com-20110406212345-a7w7nkcuq60ybi4z
Merge Monty: Windows Fixes
Merge Olaf: open_table refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/locking/global.cc
193
193
        break;
194
194
      }
195
195
 
196
 
      if (version != refresh_version)
 
196
      if (open_tables.version != refresh_version)
197
197
      {
198
198
        /* Clear the lock type of all lock data to avoid reusage. */
199
199
        reset_lock_data_and_free(&sql_lock);
1032
1032
                            "Waiting for release of readlock");
1033
1033
 
1034
1034
    while (must_wait(is_not_commit) && not getKilled() &&
1035
 
           (!abort_on_refresh || version == refresh_version))
 
1035
           (!abort_on_refresh || open_tables.version == refresh_version))
1036
1036
    {
1037
1037
      boost_unique_lock_t scoped(LOCK_global_read_lock, boost::adopt_lock_t());
1038
1038
      COND_global_read_lock.wait(scoped);