← Back to branch summary

~prafulla-t/drizzle/drz-bugfix-586051

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

  • Committer: lbieber
  • Date: 2010-08-05 01:41:12 UTC
  • mfrom: (1685.2.2 staging)
  • Revision ID: lbieber@orisndriz03-20100805014112-wbm3goytk3o2jrr1
Merge Brian - custom lock encapsulation, and myisam lock removel code

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
488
488
                             &write_lock_used)))
489
489
  {
490
490
    for (uint32_t x= 0; x < locked->lock_count; x++)
491
 
      thr_abort_locks(locked->locks[x]->lock);
 
491
      locked->locks[x]->lock->abort_locks();
492
492
    free((unsigned char*) locked);
493
493
  }
494
494
}
515
515
  if ((locked= get_lock_data(session, &table, 1, false,
516
516
                             &write_lock_used)))
517
517
  {
518
 
    for (uint32_t i=0; i < locked->lock_count; i++)
 
518
    for (uint32_t i= 0; i < locked->lock_count; i++)
519
519
    {
520
 
      if (thr_abort_locks_for_thread(locked->locks[i]->lock,
521
 
                                     table->in_use->thread_id))
 
520
      if (locked->locks[i]->lock->abort_locks_for_thread(table->in_use->thread_id))
522
521
        result= true;
523
522
    }
524
523
    free((unsigned char*) locked);