diff options
| -rw-r--r-- | include/my_pthread.h | 12 | ||||
| -rw-r--r-- | innobase/srv/srv0start.c | 3 | ||||
| -rw-r--r-- | mysys/mf_iocache.c | 15 |
3 files changed, 19 insertions, 11 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 038030540e8..a822d2db484 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -522,11 +522,13 @@ typedef struct _my_rw_lock_t { #define rw_unlock(A) my_rw_unlock((A)) #define rwlock_destroy(A) my_rwlock_destroy((A)) -extern int my_rwlock_init( my_rw_lock_t *, void * ); -extern int my_rwlock_destroy( my_rw_lock_t * ); -extern int my_rw_rdlock( my_rw_lock_t * ); -extern int my_rw_wrlock( my_rw_lock_t * ); -extern int my_rw_unlock( my_rw_lock_t * ); +extern int my_rwlock_init(my_rw_lock_t *, void *); +extern int my_rwlock_destroy(my_rw_lock_t *); +extern int my_rw_rdlock(my_rw_lock_t *); +extern int my_rw_wrlock(my_rw_lock_t *); +extern int my_rw_unlock(my_rw_lock_t *); +extern int my_rw_tryrdlock(my_rw_lock_t *); +extern int my_rw_trywrlock(my_rw_lock_t *); #endif /* USE_MUTEX_INSTEAD_OF_RW_LOCKS */ #define GETHOSTBYADDR_BUFF_SIZE 2048 diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index fa4f4bc9419..f5a0c62aaf9 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -1351,7 +1351,8 @@ innobase_shutdown_for_mysql(void) srv_conc_n_threads); } +#ifdef NOT_WORKING_YET ut_free_all_mem(); - +#endif return((int) DB_SUCCESS); } diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 54513ba73de..f5e381cf026 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -468,9 +468,11 @@ static int lock_io_cache(IO_CACHE *info) very beginning, that is returns 1 and does not unlock the mutex. */ if (++(info->share->count)) - return pthread_mutex_unlock(&info->share->mutex); - else - return 1; + { + pthread_mutex_unlock(&info->share->mutex); + return 0; + } + return 1; } static void unlock_io_cache(IO_CACHE *info) @@ -479,6 +481,7 @@ static void unlock_io_cache(IO_CACHE *info) pthread_mutex_unlock(&info->share->mutex); } + /* Read from IO_CACHE when it is shared between several threads. It works as follows: when a thread tries to read from a file @@ -488,6 +491,7 @@ static void unlock_io_cache(IO_CACHE *info) returns 1, the thread does actual IO and unlock_io_cache(), which signals all the waiting threads that data is in the buffer. */ + int _my_b_read_r(register IO_CACHE *info, byte *Buffer, uint Count) { my_off_t pos_in_file; @@ -1068,8 +1072,9 @@ int _flush_io_cache(IO_CACHE *info, int need_append_buffer_lock) if ((length=(uint) (info->write_pos - info->write_buffer))) { pos_in_file=info->pos_in_file; - /* if we have append cache, we always open the file with - O_APPEND which moves the pos to EOF automatically on every write + /* + If we have append cache, we always open the file with + O_APPEND which moves the pos to EOF automatically on every write */ if (!append_cache && info->seek_not_done) { /* File touched, do seek */ |