okkez	2012-02-14 00:29:27 +0900 (Tue, 14 Feb 2012)

  New Revision: 34583

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34583

  Log:
    merge revision(s) 34033: [Backport #5997]
    
            * thread_pthread.c (rb_thread_create_timer_thread): fix memory
              leak. [ruby-dev:44904] [Bug #5688]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/thread_pthread.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 34582)
+++ ruby_1_9_2/ChangeLog	(revision 34583)
@@ -1,3 +1,8 @@
+Tue Feb 14 00:00:19 2012  okkez  <okkez000@g...>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): fix memory
+	  leak. [ruby-dev:44904] [Bug #5688]
+
 Fri Feb  9 02:11:19 2012  Martin Bosslet  <Martin.Bosslet@g...>
 
 	* backport r34482 from trunk
Index: ruby_1_9_2/thread_pthread.c
===================================================================
--- ruby_1_9_2/thread_pthread.c	(revision 34582)
+++ ruby_1_9_2/thread_pthread.c	(revision 34583)
@@ -857,6 +857,7 @@
 	}
 	native_cond_wait(&timer_thread_cond, &timer_thread_lock);
 	native_mutex_unlock(&timer_thread_lock);
+	pthread_attr_destroy(&attr);
     }
     rb_disable_interrupt(); /* only timer thread recieve signal */
 }
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 34582)
+++ ruby_1_9_2/version.h	(revision 34583)
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 315
+#define RUBY_PATCHLEVEL 316
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 10
-#define RUBY_RELEASE_DATE "2012-02-10"
+#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DATE "2012-02-14"
 
 #include "ruby/version.h"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/