diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-06-10 18:00:32 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-06-10 18:00:32 +0400 |
| commit | 90343dd788471cbc384f7f11b7d48fc474ece4c5 (patch) | |
| tree | 36a7bd639924362b90a7a45f3064680645dd8120 | |
| parent | ce5927dc8943368395cb770639995cc609975b62 (diff) | |
| parent | 14182ec9176f2b368270cd82a4a3b31b218f9252 (diff) | |
| download | mariadb-git-90343dd788471cbc384f7f11b7d48fc474ece4c5.tar.gz | |
Auto-merge from mysql-trunk-bugfixing.
| -rw-r--r-- | mysys/my_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index e7ab98bcb73..f27f3f7b3e8 100644 --- 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 |