diff options
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_locking.c | 9 | ||||
| -rw-r--r-- | myisam/mi_static.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c index c6fc8736145..f34497fc0b6 100644 --- a/myisam/mi_locking.c +++ b/myisam/mi_locking.c @@ -25,9 +25,6 @@ #ifdef __WIN__ #include <errno.h> #endif -#if !defined(HAVE_PREAD) && defined(THREAD) -pthread_mutex_t THR_LOCK_keycache; -#endif /* lock table by F_UNLCK, F_RDLCK or F_WRLCK */ @@ -73,14 +70,8 @@ int mi_lock_database(MI_INFO *info, int lock_type) { share->state.process= share->last_process=share->this_process; share->state.unique= info->last_unique= info->this_unique; -#ifndef HAVE_PREAD - pthread_mutex_lock(&THR_LOCK_keycache); /* QQ; Has to be removed! */ -#endif if (mi_state_info_write(share->kfile, &share->state, 1)) error=my_errno; -#ifndef HAVE_PREAD - pthread_mutex_unlock(&THR_LOCK_keycache);/* QQ; Has to be removed! */ -#endif share->changed=0; if (myisam_flush) { diff --git a/myisam/mi_static.c b/myisam/mi_static.c index 4cc831e3f78..035526f525d 100644 --- a/myisam/mi_static.c +++ b/myisam/mi_static.c @@ -33,7 +33,7 @@ File myisam_log_file= -1; uint myisam_quick_table_bits=9; uint myisam_block_size=MI_KEY_BLOCK_LENGTH; /* Best by test */ my_bool myisam_flush=0,myisam_delay_key_write=0; -#if defined(THREAD) && !defined(DONT_USE_RW_LOCKS) && defined(HAVE_PREAD) +#if defined(THREAD) && !defined(DONT_USE_RW_LOCKS) my_bool myisam_concurrent_insert=1; #else my_bool myisam_concurrent_insert=0; |