← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_lock.cc

  • Committer: Brian Aker
  • Date: 2009-02-21 00:18:15 UTC
  • Revision ID: brian@tangent.org-20090221001815-x20e8h71e984lvs1
Completion (?) of uint conversion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_lock.cc
685
685
*/
686
686
 
687
687
 
688
 
#define LOCK_CMP(A,B) ((unsigned char*) (A->lock) - (uint) ((A)->type) < (unsigned char*) (B->lock)- (uint) ((B)->type))
 
688
#define LOCK_CMP(A,B) ((unsigned char*) (A->lock) - (uint32_t) ((A)->type) < (unsigned char*) (B->lock)- (uint32_t) ((B)->type))
689
689
 
690
690
static void sort_locks(THR_LOCK_DATA **data,uint32_t count)
691
691
{
720
720
    enum enum_thr_lock_result result= thr_lock(*pos, owner, (*pos)->type);
721
721
    if (result != THR_LOCK_SUCCESS)
722
722
    {                                           /* Aborted */
723
 
      thr_multi_unlock(data,(uint) (pos-data));
 
723
      thr_multi_unlock(data,(uint32_t) (pos-data));
724
724
      return(result);
725
725
    }
726
726
  }