Auto-merge from mysql-trunk-bugfixing.

2010-06-10 18:00:32 +04:00 · 2010-06-10 18:00:32 +04:00 · 222076528d
commit 222076528d
parent 5fcfeb0817 b985f88460
1 changed files with 2 additions and 0 deletions
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@ -104,6 +104,8 @@ my_bool my_basic_init(void)
  mysql_stdin= & instrumented_stdin;

 #if defined(THREAD)
+  if (my_thread_global_init())
+    return 1;
 #  if defined(SAFE_MUTEX)
  safe_mutex_global_init();		/* Must be called early */
 #  endif