summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@ibmvm>2010-06-10 17:44:19 +0400
committerAlexander Nozdrin <alik@ibmvm>2010-06-10 17:44:19 +0400
commit14182ec9176f2b368270cd82a4a3b31b218f9252 (patch)
tree1fb25244a6b004ddafb31844314b374fe38adf33 /mysys
parentbe9c400638403e082be9cb2c70d43f96211ce41e (diff)
downloadmariadb-git-14182ec9176f2b368270cd82a4a3b31b218f9252.tar.gz
Revert a patch for Bug#54334 (Double initialization of mysys mutexes).
Revision ID of the patch: marc.alff@oracle.com-20100608124148-lr1ult7lwo75niev
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_init.c2
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