diff options
| author | Chad MILLER <chad@mysql.com> | 2009-01-13 10:50:22 -0500 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-01-13 10:50:22 -0500 |
| commit | 97523591b027778db3bda16f5e63b244d19a53ff (patch) | |
| tree | 312dd9a3d3553d47e935fff162560012a490d3b9 /mysys | |
| parent | 27a2c73917fc5f7c2412876097943a798d2074bf (diff) | |
| parent | f4d0b4760ac5ea78c20c8f88321576b1456683d9 (diff) | |
| download | mariadb-git-97523591b027778db3bda16f5e63b244d19a53ff.tar.gz | |
Merge fix for bug 38364.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 4b45d5ddc1a..0eec242818d 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -78,8 +78,12 @@ my_bool my_init(void) my_umask= 0660; /* Default umask for new files */ my_umask_dir= 0700; /* Default umask for new directories */ init_glob_errs(); -#if defined(THREAD) && defined(SAFE_MUTEX) +#if defined(THREAD) + if (my_thread_global_init()) + return 1; +# if defined(SAFE_MUTEX) safe_mutex_global_init(); /* Must be called early */ +# endif #endif #if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX) fastmutex_global_init(); /* Must be called early */ @@ -89,8 +93,6 @@ my_bool my_init(void) #if defined(HAVE_PTHREAD_INIT) pthread_init(); /* Must be called before DBUG_ENTER */ #endif - if (my_thread_global_init()) - return 1; #if !defined( __WIN__) && !defined(__NETWARE__) sigfillset(&my_signals); /* signals blocked by mf_brkhant */ #endif |