diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysys/my_init.c | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 71b3d960386..ae4aa5bb5b7 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -96,10 +96,10 @@ my_bool my_basic_init(void) if (my_progname) my_progname_short= my_progname + dirname_length(my_progname); +#if defined(THREAD) /* Initalize our mutex handling */ my_mutex_init(); -#if defined(THREAD) if (my_thread_global_init()) return 1; #if defined(HAVE_PTHREAD_INIT) |