From a25b3c05e7600a5b66e8043b6e9dbb8927bca94b Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 29 Dec 2008 07:19:32 +0000
Subject: merges r21148 from trunk into ruby_1_9_1. * thread.c
 (rb_mutex_trylock): return false if Mutex owned   by current thread. 
 [ruby-core:20943] * thread.c (rb_mutex_lock): check dead lock (recursive
 lock) here. * test/ruby/test_thread.rb: add a test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 486e0e3f53..7af2b6d241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Dec 29 11:58:39 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_mutex_trylock): return false if Mutex owned
+	  by current thread.  [ruby-core:20943]
+
+	* thread.c (rb_mutex_lock): check dead lock (recursive lock) here.
+
+	* test/ruby/test_thread.rb: add a test.
+
 Mon Dec 29 07:15:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com>
-- 
cgit v1.2.3