Commit 0ca073c6 authored by thek@adventure.(none)'s avatar thek@adventure.(none)
Browse files

Merge adventure.(none):/home/thek/Development/cpp/bug32436/my50-bug32436 

into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
parents 9817d93e 95bfde3d

sql/item_func.cc

+1 −2
Original line number Diff line number Diff line
@@ -3739,13 +3739,12 @@ longlong Item_func_sleep::val_int() 
      break;

    error= 0;

  }



  pthread_mutex_unlock(&LOCK_user_locks);

  pthread_mutex_lock(&thd->mysys_var->mutex);

  thd->mysys_var->current_mutex= 0;

  thd->mysys_var->current_cond=  0;

  pthread_mutex_unlock(&thd->mysys_var->mutex);



  pthread_mutex_unlock(&LOCK_user_locks);

  pthread_cond_destroy(&cond);



  return test(!error); 		// Return 1 killed