Auto-merge from mysql-trunk-bugfixing.

90343dd7 · Alexander Nozdrin · ce5927dc · 14182ec9 · 90343dd7
Commit 90343dd7 authored Jun 10, 2010 by Alexander Nozdrin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mysys/my_init.c mysys/my_init.c +2 -0

No files found.
--- 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