diff options
| author | Marc Alff <marc.alff@oracle.com> | 2010-06-08 06:41:48 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@oracle.com> | 2010-06-08 06:41:48 -0600 |
| commit | be9c400638403e082be9cb2c70d43f96211ce41e (patch) | |
| tree | 3871064a5a94e4f77ecd93a581bd6f7ff1899b9a /mysys | |
| parent | 60a9d9bbb94ac03159bcc2d75b649abb1c9dc956 (diff) | |
| download | mariadb-git-be9c400638403e082be9cb2c70d43f96211ce41e.tar.gz | |
Bug#54334 Double initialization of mysys mutexes
Prior to this fix, mysys mutexes such as THR_LOCK_lock could be initialized
twice by a call to my_init().
The root cause was out of place initialization in my_basic_init(),
calling my_thread_global_init().
With this fix,
- my_basic_init() properly initializes the mutex implementation itself,
for SAFE or FAST mutexes, and for platform dependent initializations,
before initialiazing a mutex.
- my_init() properly initializes mysys mutexes once,
when making the first call to my_thread_global_init().
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index f27f3f7b3e8..e7ab98bcb73 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -104,8 +104,6 @@ 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 |