diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-08-24 18:06:44 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-08-24 18:06:44 +0300 |
| commit | 63d18a6057d4ae95f0e7afe07ec97c75e0da55b8 (patch) | |
| tree | 0138f5d935b18977e1a6b7773e36a4ccfda7cf3a /mysys/my_init.c | |
| parent | c4811d67f7288ef74c795c9a6d7cf9aee2eab98b (diff) | |
| download | mariadb-git-63d18a6057d4ae95f0e7afe07ec97c75e0da55b8.tar.gz | |
Bug #28284: Test "mysqlslap" reports "out of memory"
When locking a "fast" mutex a static variable cpu_count
was used as a flag to initialize itself on the first usage
by calling sysconf() and setting non-zero value.
This is not thread and optimization safe on some
platforms. That's why the global initialization needs
to be done once in a designated function.
This will also speed up the usage (by a small bit)
because it won't have to check if it's initialized on
every call.
Fixed by moving the fast mutexes initialization out of
my_pthread_fastmutex_lock() to fastmutex_global_init()
and call it from my_init()
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 257edb351b4..b2eefe97ee8 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -79,6 +79,9 @@ my_bool my_init(void) #if defined(THREAD) && defined(SAFE_MUTEX) safe_mutex_global_init(); /* Must be called early */ #endif +#if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX) + fastmutex_global_init(); /* Must be called early */ +#endif netware_init(); #ifdef THREAD #if defined(HAVE_PTHREAD_INIT) |