← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

  • Committer: Brian Aker
  • Date: 2010-04-23 00:20:04 UTC
  • Revision ID: brian@gaz-20100423002004-xykjo19zf1rd4kdb
encapsulate engine inside of cursor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
223
223
      set<size_t> involved_slots;
224
224
      for (size_t x= 1; x <= num_tables; x++, tables++)
225
225
      {
226
 
        engine= (*tables)->cursor->engine;
 
226
        engine= (*tables)->cursor->getEngine();
227
227
        if (involved_slots.count(engine->getId()) > 0)
228
228
          continue; /* already added to involved engines */
229
229
        involved_engines.push_back(engine);
348
348
 
349
349
    if ((error=(*tables)->cursor->ha_external_lock(session,lock_type)))
350
350
    {
351
 
      print_lock_error(error, (*tables)->cursor->engine->getName().c_str());
 
351
      print_lock_error(error, (*tables)->cursor->getEngine()->getName().c_str());
352
352
      while (--i)
353
353
      {
354
354
        tables--;
543
543
      if ((error=(*table)->cursor->ha_external_lock(session, F_UNLCK)))
544
544
      {
545
545
        error_code=error;
546
 
        print_lock_error(error_code, (*table)->cursor->engine->getName().c_str());
 
546
        print_lock_error(error_code, (*table)->cursor->getEngine()->getName().c_str());
547
547
      }
548
548
    }
549
549
    table++;