← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2011-02-27 19:43:52 UTC
  • mfrom: (2192.4.9 iter)
  • Revision ID: brian@tangent.org-20110227194352-w48j3ey8nhonecsd
Merge in find_ptr

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
226
226
             iter != table::getCache().end();
227
227
             iter++)
228
228
        {
229
 
          Table *table= (*iter).second;
 
229
          Table *table= iter->second;
230
230
          if (table->in_use)
231
231
            table->in_use->some_tables_deleted= false;
232
232
        }
269
269
             iter != table::getCache().end();
270
270
             iter++)
271
271
        {
272
 
          Table *table= (*iter).second;
 
272
          Table *table= iter->second;
273
273
          /* Avoid a self-deadlock. */
274
274
          if (table->in_use == session)
275
275
            continue;
1023
1023
      for (table::CacheMap::const_iterator iter= ppp.first;
1024
1024
           iter != ppp.second; ++iter, table= NULL)
1025
1025
      {
1026
 
        table= (*iter).second;
 
1026
        table= iter->second;
1027
1027
 
1028
1028
        if (not table->in_use)
1029
1029
          break;