database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix for SAFE_MUTEX + MERGE tables

Browse Source 
Docs/manual.texi:
  Fix for release
include/my_pthread.h:
  Fix for SAFE_MUTEX for windows
include/myisammrg.h:
  Fix for empty MERGE tables
myisam/ft_stopwords.c:
  Free used memory
myisammrg/myrg_open.c:
  Fix for empty MERGE tables
myisammrg/myrg_queue.c:
  Fix for empty MERGE tables
myisammrg/myrg_rfirst.c:
  cleanup
myisammrg/myrg_rkey.c:
  cleanup
mysys/my_thr_init.c:
  Fix SAFE_MUTEX for windows
mysys/my_winthread.c:
  Fix SAFE_MUTEX for windows
mysys/thr_mutex.c:
  Fix SAFE_MUTEX for windows
sql/ha_myisammrg.cc:
  Fix for empty MERGE tables
sql/mysqld.cc:
  Fix type
This commit is contained in:
unknown
2000-09-21 01:58:38 +03:00
parent 73826420c3
commit 43044b685f
13 changed files with 62 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysys/my_thr_init.c
View File

@@ -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.