database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Portability fixes.

Browse Source 
Don't free memory from InnoDB at exit (as this may be done before other threads are finnished)


include/my_pthread.h:
  Added missing prototypes
innobase/srv/srv0start.c:
  Don't free memory at exit (as this may be done before other threads are finnished)
mysys/mf_iocache.c:
  Cleanup (Don't rely on return value from mutex_unlock())
This commit is contained in:
unknown
2002-07-01 11:19:17 +03:00
parent f26ae21229
commit 61ee4a8087
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_pthread.h
View File

@ -527,6 +527,8 @@ 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

3
innobase/srv/srv0start.c
View File

@ -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);
}

11
mysys/mf_iocache.c
View File

@ -468,8 +468,10 @@ 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
{
pthread_mutex_unlock(&info->share->mutex);
return 0;
}
return 1;
}
@ -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,7 +1072,8 @@ 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
/*
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)