← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_lock.c

Merged in Jay's tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_lock.c
1099
1099
bool thr_abort_locks_for_thread(THR_LOCK *lock, my_thread_id thread_id)
1100
1100
{
1101
1101
  THR_LOCK_DATA *data;
1102
 
  bool found= FALSE;
 
1102
  bool found= false;
1103
1103
  DBUG_ENTER("thr_abort_locks_for_thread");
1104
1104
 
1105
1105
  pthread_mutex_lock(&lock->mutex);
1110
1110
      DBUG_PRINT("info",("Aborting read-wait lock"));
1111
1111
      data->type= TL_UNLOCK;                    /* Mark killed */
1112
1112
      /* It's safe to signal the cond first: we're still holding the mutex. */
1113
 
      found= TRUE;
 
1113
      found= true;
1114
1114
      pthread_cond_signal(data->cond);
1115
1115
      data->cond= 0;                            /* Removed from list */
1116
1116
 
1126
1126
    {
1127
1127
      DBUG_PRINT("info",("Aborting write-wait lock"));
1128
1128
      data->type= TL_UNLOCK;
1129
 
      found= TRUE;
 
1129
      found= true;
1130
1130
      pthread_cond_signal(data->cond);
1131
1131
      data->cond= 0;
1132
1132