← 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: 2009-05-15 07:40:30 UTC
  • mfrom: (1019.1.7 merge)
  • Revision ID: brian@gaz-20090515074030-che1sh7nqadhyj45
Code / Style cleanup merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
504
504
      thr_abort_locks(locked->locks[i]->lock, upgrade_lock);
505
505
    free((unsigned char*) locked);
506
506
  }
507
 
  return;
508
507
}
509
508
 
510
509
 
679
678
  }
680
679
 
681
680
 end:
682
 
  return(NULL);
 
681
  return NULL;
683
682
}
684
683
 
685
684