merges r20615 from trunk into ruby_1_9_1.

* thread.c (rb_mutex_unlock): shut up warning.  a patch from
  Kazuhiro NISHIYAMA in [ruby-dev:37345]. fix #846

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8273e78469..8ed7a52a2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 11 01:21:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (rb_mutex_unlock): shut up warning.  a patch from
+	  Kazuhiro NISHIYAMA in [ruby-dev:37345]. fix #846
+
 Wed Dec 10 23:58:56 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* complex.c: avoided warnings on cpp. [ruby-dev:37344]
diff --git a/thread.c b/thread.c
index 4fbc14d86c..4ab0788534 100644
--- a/thread.c
+++ b/thread.c
@@ -2978,7 +2978,7 @@ rb_mutex_unlock(VALUE self)
     GetMutexPtr(self, mutex);
 
     err = mutex_unlock(mutex);
-    if (err) rb_raise(rb_eThreadError, err);
+    if (err) rb_raise(rb_eThreadError, "%s", err);
 
     return self;
 }