diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-21 01:58:38 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-21 01:58:38 +0300 |
| commit | 43044b685f765718f5f90ac26fa3e2317b5749e9 (patch) | |
| tree | e2dd869fb38dfdf7e26817e7b0f7a7a6add22758 /include | |
| parent | 73826420c3114dad809c2c051ba60a6e3f50ee20 (diff) | |
| download | mariadb-git-43044b685f765718f5f90ac26fa3e2317b5749e9.tar.gz | |
Fix for SAFE_MUTEX + MERGE tables
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 1 | ||||
| -rw-r--r-- | include/myisammrg.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 71ad5e42bf2..69d472bf266 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -60,6 +60,7 @@ typedef int pthread_mutexattr_t; #define pthread_handler_decl(A,B) unsigned __cdecl A(void *B) typedef unsigned (__cdecl *pthread_handler)(void *); +void win_pthread_init(void); int win_pthread_setspecific(void *A,void *B,uint length); int pthread_create(pthread_t *,pthread_attr_t *,pthread_handler,void *); int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr); diff --git a/include/myisammrg.h b/include/myisammrg.h index 6b1124fa180..a797c954614 100644 --- a/include/myisammrg.h +++ b/include/myisammrg.h @@ -59,7 +59,7 @@ typedef struct st_myrg_info ulonglong records; /* records in tables */ ulonglong del; /* Removed records */ ulonglong data_file_length; - uint tables,options,reclength; + uint tables,options,reclength,keys; my_bool cache_in_use; LIST open_list; QUEUE by_key; |