diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-06 18:23:41 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-06 18:23:41 +0200 |
| commit | 12376c17b3d79aea4b905980ba0ae25f669e20ce (patch) | |
| tree | e454de8abcaa867a271a80b1b8c982e85f133a9b | |
| parent | 7ae2e080072a64365d6bb7e79fd4c451f8982362 (diff) | |
| parent | f94cf3fb6b2be3f4c78e2744d85c9d6f9a93f127 (diff) | |
| download | mariadb-git-12376c17b3d79aea4b905980ba0ae25f669e20ce.tar.gz | |
merged mysql-5.0->mysql-5.0-security
| -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 |