diff options
| author | monty@donna.mysql.com <> | 2000-09-21 01:58:38 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-09-21 01:58:38 +0300 |
| commit | df280335b0c026525a7d7f6164247cda63967067 (patch) | |
| tree | e2dd869fb38dfdf7e26817e7b0f7a7a6add22758 /mysys/my_thr_init.c | |
| parent | 80d200e18b2b8d4e3f5528895f97eee49aede9a5 (diff) | |
| download | mariadb-git-df280335b0c026525a7d7f6164247cda63967067.tar.gz | |
Fix for SAFE_MUTEX + MERGE tables
Diffstat (limited to 'mysys/my_thr_init.c')
| -rw-r--r-- | mysys/my_thr_init.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 6b75444f3fc..f24c8393ba9 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -35,9 +35,6 @@ pthread_mutex_t THR_LOCK_malloc,THR_LOCK_open,THR_LOCK_keycache, #ifndef HAVE_LOCALTIME_R pthread_mutex_t LOCK_localtime_r; #endif -#ifdef __WIN__ -pthread_mutex_t THR_LOCK_thread; -#endif /* FIXME Note. TlsAlloc does not set an auto destructor, so the function my_thread_global_free must be called from @@ -60,7 +57,7 @@ my_bool my_thread_global_init(void) pthread_mutex_init(&THR_LOCK_net,NULL); pthread_mutex_init(&THR_LOCK_charset,NULL); #ifdef __WIN__ - pthread_mutex_init(&THR_LOCK_thread,NULL); + win_pthread_init(); #endif #ifndef HAVE_LOCALTIME_R pthread_mutex_init(&LOCK_localtime_r,NULL); @@ -78,7 +75,7 @@ void my_thread_global_end(void) static long thread_id=0; /* - We can't use mutex_locks here if we re using windows as + We can't use mutex_locks here if we are using windows as we may have compiled the program with SAFE_MUTEX, in which case the checking of mutex_locks will not work until the pthread_self thread specific variable is initialized. |