List:Commits« Previous MessageNext Message »
From:Ramil Kalimullin Date:January 31 2012 6:55am
Subject:bzr push into mysql-5.0 branch (ramil:2909 to 2910) Bug#13596377
View as plain text  
 2910 Ramil Kalimullin	2012-01-30
      Fix for BUG#13596377: MYSQL CRASHES ON STARTUP ON FREEBSD IN PB2
      
      Fix for #36428/#38364 backported into 5.0.

    modified:
      mysys/my_init.c
 2909 Bjorn Munch	2012-01-11 [merge]
      Merge from mysql-5.0.95-release

    modified:
      .bzrignore
      client/sql_string.cc
      include/m_string.h
      myisam/mi_preload.c
      mysql-test/r/key_cache.result
      mysql-test/r/type_float.result
      mysql-test/r/type_newdecimal.result
      mysql-test/r/view_grant.result
      mysql-test/t/key_cache.test
      mysql-test/t/type_float.test
      mysql-test/t/type_newdecimal.test
      mysql-test/t/view_grant.test
      sql/my_decimal.h
      sql/sql_string.cc
      sql/sql_table.cc
      sql/sql_view.cc
      sql/unireg.h
      strings/decimal.c
=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2011-06-30 15:31:31 +0000
+++ b/mysys/my_init.c	2012-01-30 18:52:33 +0000
@@ -77,16 +77,18 @@ my_bool my_init(void)
   mysys_usage_id++;
   my_umask= 0660;                       /* Default umask for new files */
   my_umask_dir= 0700;                   /* Default umask for new directories */
-#if defined(THREAD) && defined(SAFE_MUTEX)
+#if defined(THREAD)
+  if (my_thread_global_init())
+    return 1;
+#if defined(SAFE_MUTEX)
   safe_mutex_global_init();		/* Must be called early */
-#endif
+#endif /* SAFE_MUTEX */
+#endif /* THREAD */
   netware_init();
 #ifdef THREAD
 #if defined(HAVE_PTHREAD_INIT)
   pthread_init();			/* Must be called before DBUG_ENTER */
 #endif
-  if (my_thread_global_init())
-    return 1;
 #if !defined( __WIN__) && !defined(OS2) && !defined(__NETWARE__)
   sigfillset(&my_signals);		/* signals blocked by mf_brkhant */
 #endif

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.0 branch (ramil:2909 to 2910) Bug#13596377Ramil Kalimullin31 Jan