diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2012-01-30 22:52:33 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2012-01-30 22:52:33 +0400 |
| commit | 882ef63e704002a9b0be76efff0259e7b61871d8 (patch) | |
| tree | 1ec386ce297df3a1b763ef72686fc731619051ab /mysys | |
| parent | dcc2f72943e211688a3b552a81a47f90fa56c611 (diff) | |
| download | mariadb-git-882ef63e704002a9b0be76efff0259e7b61871d8.tar.gz | |
Fix for BUG#13596377: MYSQL CRASHES ON STARTUP ON FREEBSD IN PB2
Fix for #36428/#38364 backported into 5.0.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 4095f4b865e..87ec253f983 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -77,16 +77,18 @@ my_bool my_init(void) mysys_usage_id++; my_umask= 0660; /* Default umask for new files */ my_umask_dir= 0700; /* Default umask for new directories */ -#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 /* SAFE_MUTEX */ +#endif /* THREAD */ netware_init(); #ifdef THREAD #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(OS2) && !defined(__NETWARE__) sigfillset(&my_signals); /* signals blocked by mf_brkhant */ #endif |