← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

  • Committer: Jay Pipes
  • Date: 2010-03-05 03:13:24 UTC
  • mfrom: (1273.1.32 bug530870)
  • mto: This revision was merged to the branch mainline in revision 1325.
  • Revision ID: jpipes@serialcoder-20100305031324-bto9lkg9ygj9udet
Merge fixes for LP Bug 530870

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
224
224
      for (size_t x= 1; x <= num_tables; x++, tables++)
225
225
      {
226
226
        engine= (*tables)->cursor->engine;
227
 
        if (involved_slots.count(engine->getSlot()) > 0)
 
227
        if (involved_slots.count(engine->getId()) > 0)
228
228
          continue; /* already added to involved engines */
229
229
        involved_engines.push_back(engine);
230
 
        involved_slots.insert(engine->getSlot());
 
230
        involved_slots.insert(engine->getId());
231
231
      }
232
232
 
233
233
      for_each(involved_engines.begin(),